timamsk/vscodium
1
0
Fork 0
mirror of https://github.com/VSCodium/vscodium.git synced 2026-04-11 16:27:18 +10:00
Code Issues Packages Projects Releases Wiki Activity

feat(1.110): update patches (#2715)

Browse Source
This commit is contained in:
Baptiste Augrain
2026-02-27 16:34:05 +01:00
committed by GitHub
parent 1dec128c07
commit ccd71421da
12 changed files with 479 additions and 513 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
dev/update_patches.sh
View File

@@ -119,6 +119,7 @@ check_file() {
fi fi
while [[ -n "$( find . -name '*.rej' -print )" ]]; do while [[ -n "$( find . -name '*.rej' -print )" ]]; do
find . -name '*.rej' -print
read -rp "Press any key when the conflict have been resolved..." -n1 -s read -rp "Press any key when the conflict have been resolved..." -n1 -s
echo echo
done done

152
patches/brand.patch
View File

@@ -71,37 +71,37 @@ index 5c73304..3294fd8 100644
+const apiProposalNotListed = l10n.t("This proposal cannot be used because for this extension the product defines a fixed set of API proposals. You can test your extension but before publishing you MUST reach out to the !!APP_NAME!! team."); +const apiProposalNotListed = l10n.t("This proposal cannot be used because for this extension the product defines a fixed set of API proposals. You can test your extension but before publishing you MUST reach out to the !!APP_NAME!! team.");
diff --git a/extensions/git/package.nls.json b/extensions/git/package.nls.json diff --git a/extensions/git/package.nls.json b/extensions/git/package.nls.json
index 94a1f61..c0ac9ea 100644 index 9d469e3..54ec4c4 100644
--- a/extensions/git/package.nls.json --- a/extensions/git/package.nls.json
+++ b/extensions/git/package.nls.json +++ b/extensions/git/package.nls.json
@@ -250,3 +250,3 @@ @@ -254,3 +254,3 @@
"{Locked='](command:git.showOutput'}", "{Locked='](command:git.showOutput'}",
- "Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for VS Code", - "Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for VS Code",
+ "Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for !!APP_NAME!!", + "Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for !!APP_NAME!!",
"Please make sure there is no space between the right bracket and left parenthesis: ]( this is an internal syntax for links" "Please make sure there is no space between the right bracket and left parenthesis: ]( this is an internal syntax for links"
@@ -278,4 +278,4 @@ @@ -282,4 +282,4 @@
"config.showCommitInput": "Controls whether to show the commit input in the Git source control panel.", "config.showCommitInput": "Controls whether to show the commit input in the Git source control panel.",
- "config.terminalAuthentication": "Controls whether to enable VS Code to be the authentication handler for Git processes spawned in the Integrated Terminal. Note: Terminals need to be restarted to pick up a change in this setting.", - "config.terminalAuthentication": "Controls whether to enable VS Code to be the authentication handler for Git processes spawned in the Integrated Terminal. Note: Terminals need to be restarted to pick up a change in this setting.",
- "config.terminalGitEditor": "Controls whether to enable VS Code to be the Git editor for Git processes spawned in the integrated terminal. Note: Terminals need to be restarted to pick up a change in this setting.", - "config.terminalGitEditor": "Controls whether to enable VS Code to be the Git editor for Git processes spawned in the integrated terminal. Note: Terminals need to be restarted to pick up a change in this setting.",
+ "config.terminalAuthentication": "Controls whether to enable !!APP_NAME!! to be the authentication handler for Git processes spawned in the Integrated Terminal. Note: Terminals need to be restarted to pick up a change in this setting.", + "config.terminalAuthentication": "Controls whether to enable !!APP_NAME!! to be the authentication handler for Git processes spawned in the Integrated Terminal. Note: Terminals need to be restarted to pick up a change in this setting.",
+ "config.terminalGitEditor": "Controls whether to enable !!APP_NAME!! to be the Git editor for Git processes spawned in the integrated terminal. Note: Terminals need to be restarted to pick up a change in this setting.", + "config.terminalGitEditor": "Controls whether to enable !!APP_NAME!! to be the Git editor for Git processes spawned in the integrated terminal. Note: Terminals need to be restarted to pick up a change in this setting.",
"config.timeline.showAuthor": "Controls whether to show the commit author in the Timeline view.", "config.timeline.showAuthor": "Controls whether to show the commit author in the Timeline view.",
@@ -349,3 +349,3 @@ @@ -353,3 +353,3 @@
"{Locked='](command:workbench.extensions.search?%22%40category%3A%5C%22scm%20providers%5C%22%22'}", "{Locked='](command:workbench.extensions.search?%22%40category%3A%5C%22scm%20providers%5C%22%22'}",
- "Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for VS Code", - "Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for VS Code",
+ "Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for !!APP_NAME!!", + "Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for !!APP_NAME!!",
"Please make sure there is no space between the right bracket and left parenthesis: ]( this is an internal syntax for links" "Please make sure there is no space between the right bracket and left parenthesis: ]( this is an internal syntax for links"
@@ -359,3 +359,3 @@ @@ -363,3 +363,3 @@
"{Locked='](command:workbench.extensions.search?%22%40category%3A%5C%22scm%20providers%5C%22%22'}", "{Locked='](command:workbench.extensions.search?%22%40category%3A%5C%22scm%20providers%5C%22%22'}",
- "Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for VS Code", - "Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for VS Code",
+ "Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for !!APP_NAME!!", + "Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for !!APP_NAME!!",
"Please make sure there is no space between the right bracket and left parenthesis: ]( this is an internal syntax for links" "Please make sure there is no space between the right bracket and left parenthesis: ]( this is an internal syntax for links"
@@ -369,3 +369,3 @@ @@ -373,3 +373,3 @@
"{Locked='](command:workbench.extensions.search?%22%40category%3A%5C%22scm%20providers%5C%22%22'}", "{Locked='](command:workbench.extensions.search?%22%40category%3A%5C%22scm%20providers%5C%22%22'}",
- "Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for VS Code", - "Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for VS Code",
+ "Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for !!APP_NAME!!", + "Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for !!APP_NAME!!",
"Please make sure there is no space between the right bracket and left parenthesis: ]( this is an internal syntax for links" "Please make sure there is no space between the right bracket and left parenthesis: ]( this is an internal syntax for links"
@@ -381,6 +381,6 @@ @@ -385,6 +385,6 @@
"view.workbench.scm.disabled": { "view.workbench.scm.disabled": {
- "message": "If you would like to use Git features, please enable Git in your [settings](command:workbench.action.openSettings?%5B%22git.enabled%22%5D).\nTo learn more about how to use Git and source control in VS Code [read our docs](https://aka.ms/vscode-scm).", - "message": "If you would like to use Git features, please enable Git in your [settings](command:workbench.action.openSettings?%5B%22git.enabled%22%5D).\nTo learn more about how to use Git and source control in VS Code [read our docs](https://aka.ms/vscode-scm).",
+ "message": "If you would like to use Git features, please enable Git in your [settings](command:workbench.action.openSettings?%5B%22git.enabled%22%5D).\nTo learn more about how to use Git and source control in !!APP_NAME!! [read our docs](https://aka.ms/vscode-scm).", + "message": "If you would like to use Git features, please enable Git in your [settings](command:workbench.action.openSettings?%5B%22git.enabled%22%5D).\nTo learn more about how to use Git and source control in !!APP_NAME!! [read our docs](https://aka.ms/vscode-scm).",
@@ -110,7 +110,7 @@ index 94a1f61..c0ac9ea 100644
- "Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for VS Code", - "Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for VS Code",
+ "Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for !!APP_NAME!!", + "Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for !!APP_NAME!!",
"Please make sure there is no space between the right bracket and left parenthesis: ]( this is an internal syntax for links" "Please make sure there is no space between the right bracket and left parenthesis: ]( this is an internal syntax for links"
@@ -389,6 +389,6 @@ @@ -393,6 +393,6 @@
"view.workbench.scm.empty": { "view.workbench.scm.empty": {
- "message": "In order to use Git features, you can open a folder containing a Git repository or clone from a URL.\n[Open Folder](command:vscode.openFolder)\n[Clone Repository](command:git.cloneRecursive)\nTo learn more about how to use Git and source control in VS Code [read our docs](https://aka.ms/vscode-scm).", - "message": "In order to use Git features, you can open a folder containing a Git repository or clone from a URL.\n[Open Folder](command:vscode.openFolder)\n[Clone Repository](command:git.cloneRecursive)\nTo learn more about how to use Git and source control in VS Code [read our docs](https://aka.ms/vscode-scm).",
+ "message": "In order to use Git features, you can open a folder containing a Git repository or clone from a URL.\n[Open Folder](command:vscode.openFolder)\n[Clone Repository](command:git.cloneRecursive)\nTo learn more about how to use Git and source control in !!APP_NAME!! [read our docs](https://aka.ms/vscode-scm).", + "message": "In order to use Git features, you can open a folder containing a Git repository or clone from a URL.\n[Open Folder](command:vscode.openFolder)\n[Clone Repository](command:git.cloneRecursive)\nTo learn more about how to use Git and source control in !!APP_NAME!! [read our docs](https://aka.ms/vscode-scm).",
@@ -119,7 +119,7 @@ index 94a1f61..c0ac9ea 100644
- "Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for VS Code", - "Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for VS Code",
+ "Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for !!APP_NAME!!", + "Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for !!APP_NAME!!",
"Please make sure there is no space between the right bracket and left parenthesis: ]( this is an internal syntax for links" "Please make sure there is no space between the right bracket and left parenthesis: ]( this is an internal syntax for links"
@@ -397,6 +397,6 @@ @@ -401,6 +401,6 @@
"view.workbench.scm.folder": { "view.workbench.scm.folder": {
- "message": "The folder currently open doesn't have a Git repository. You can initialize a repository which will enable source control features powered by Git.\n[Initialize Repository](command:git.init?%5Btrue%5D)\nTo learn more about how to use Git and source control in VS Code [read our docs](https://aka.ms/vscode-scm).", - "message": "The folder currently open doesn't have a Git repository. You can initialize a repository which will enable source control features powered by Git.\n[Initialize Repository](command:git.init?%5Btrue%5D)\nTo learn more about how to use Git and source control in VS Code [read our docs](https://aka.ms/vscode-scm).",
+ "message": "The folder currently open doesn't have a Git repository. You can initialize a repository which will enable source control features powered by Git.\n[Initialize Repository](command:git.init?%5Btrue%5D)\nTo learn more about how to use Git and source control in !!APP_NAME!! [read our docs](https://aka.ms/vscode-scm).", + "message": "The folder currently open doesn't have a Git repository. You can initialize a repository which will enable source control features powered by Git.\n[Initialize Repository](command:git.init?%5Btrue%5D)\nTo learn more about how to use Git and source control in !!APP_NAME!! [read our docs](https://aka.ms/vscode-scm).",
@@ -128,7 +128,7 @@ index 94a1f61..c0ac9ea 100644
- "Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for VS Code", - "Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for VS Code",
+ "Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for !!APP_NAME!!", + "Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for !!APP_NAME!!",
"Please make sure there is no space between the right bracket and left parenthesis: ]( this is an internal syntax for links" "Please make sure there is no space between the right bracket and left parenthesis: ]( this is an internal syntax for links"
@@ -405,6 +405,6 @@ @@ -409,6 +409,6 @@
"view.workbench.scm.workspace": { "view.workbench.scm.workspace": {
- "message": "The workspace currently open doesn't have any folders containing Git repositories. You can initialize a repository on a folder which will enable source control features powered by Git.\n[Initialize Repository](command:git.init)\nTo learn more about how to use Git and source control in VS Code [read our docs](https://aka.ms/vscode-scm).", - "message": "The workspace currently open doesn't have any folders containing Git repositories. You can initialize a repository on a folder which will enable source control features powered by Git.\n[Initialize Repository](command:git.init)\nTo learn more about how to use Git and source control in VS Code [read our docs](https://aka.ms/vscode-scm).",
+ "message": "The workspace currently open doesn't have any folders containing Git repositories. You can initialize a repository on a folder which will enable source control features powered by Git.\n[Initialize Repository](command:git.init)\nTo learn more about how to use Git and source control in !!APP_NAME!! [read our docs](https://aka.ms/vscode-scm).", + "message": "The workspace currently open doesn't have any folders containing Git repositories. You can initialize a repository on a folder which will enable source control features powered by Git.\n[Initialize Repository](command:git.init)\nTo learn more about how to use Git and source control in !!APP_NAME!! [read our docs](https://aka.ms/vscode-scm).",
@@ -137,7 +137,7 @@ index 94a1f61..c0ac9ea 100644
- "Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for VS Code", - "Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for VS Code",
+ "Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for !!APP_NAME!!", + "Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for !!APP_NAME!!",
"Please make sure there is no space between the right bracket and left parenthesis: ]( this is an internal syntax for links" "Please make sure there is no space between the right bracket and left parenthesis: ]( this is an internal syntax for links"
@@ -413,6 +413,6 @@ @@ -417,6 +417,6 @@
"view.workbench.scm.emptyWorkspace": { "view.workbench.scm.emptyWorkspace": {
- "message": "The workspace currently open doesn't have any folders containing Git repositories.\n[Add Folder to Workspace](command:workbench.action.addRootFolder)\nTo learn more about how to use Git and source control in VS Code [read our docs](https://aka.ms/vscode-scm).", - "message": "The workspace currently open doesn't have any folders containing Git repositories.\n[Add Folder to Workspace](command:workbench.action.addRootFolder)\nTo learn more about how to use Git and source control in VS Code [read our docs](https://aka.ms/vscode-scm).",
+ "message": "The workspace currently open doesn't have any folders containing Git repositories.\n[Add Folder to Workspace](command:workbench.action.addRootFolder)\nTo learn more about how to use Git and source control in !!APP_NAME!! [read our docs](https://aka.ms/vscode-scm).", + "message": "The workspace currently open doesn't have any folders containing Git repositories.\n[Add Folder to Workspace](command:workbench.action.addRootFolder)\nTo learn more about how to use Git and source control in !!APP_NAME!! [read our docs](https://aka.ms/vscode-scm).",
@@ -146,27 +146,27 @@ index 94a1f61..c0ac9ea 100644
- "Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for VS Code", - "Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for VS Code",
+ "Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for !!APP_NAME!!", + "Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for !!APP_NAME!!",
"Please make sure there is no space between the right bracket and left parenthesis: ]( this is an internal syntax for links" "Please make sure there is no space between the right bracket and left parenthesis: ]( this is an internal syntax for links"
@@ -431,3 +431,3 @@ @@ -435,3 +435,3 @@
"{Locked='](command:workbench.action.openSettings?%5B%22git.openRepositoryInParentFolders%22%5D'}", "{Locked='](command:workbench.action.openSettings?%5B%22git.openRepositoryInParentFolders%22%5D'}",
- "Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for VS Code", - "Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for VS Code",
+ "Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for !!APP_NAME!!", + "Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for !!APP_NAME!!",
"Please make sure there is no space between the right bracket and left parenthesis: ]( this is an internal syntax for links" "Please make sure there is no space between the right bracket and left parenthesis: ]( this is an internal syntax for links"
@@ -440,3 +440,3 @@ @@ -444,3 +444,3 @@
"{Locked='](command:workbench.action.openSettings?%5B%22git.openRepositoryInParentFolders%22%5D'}", "{Locked='](command:workbench.action.openSettings?%5B%22git.openRepositoryInParentFolders%22%5D'}",
- "Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for VS Code", - "Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for VS Code",
+ "Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for !!APP_NAME!!", + "Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for !!APP_NAME!!",
"Please make sure there is no space between the right bracket and left parenthesis: ]( this is an internal syntax for links" "Please make sure there is no space between the right bracket and left parenthesis: ]( this is an internal syntax for links"
@@ -448,3 +448,3 @@ @@ -452,3 +452,3 @@
"{Locked='](command:git.manageUnsafeRepositories'}", "{Locked='](command:git.manageUnsafeRepositories'}",
- "Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for VS Code", - "Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for VS Code",
+ "Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for !!APP_NAME!!", + "Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for !!APP_NAME!!",
"Please make sure there is no space between the right bracket and left parenthesis: ]( this is an internal syntax for links" "Please make sure there is no space between the right bracket and left parenthesis: ]( this is an internal syntax for links"
@@ -456,3 +456,3 @@ @@ -460,3 +460,3 @@
"{Locked='](command:git.manageUnsafeRepositories'}", "{Locked='](command:git.manageUnsafeRepositories'}",
- "Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for VS Code", - "Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for VS Code",
+ "Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for !!APP_NAME!!", + "Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for !!APP_NAME!!",
"Please make sure there is no space between the right bracket and left parenthesis: ]( this is an internal syntax for links" "Please make sure there is no space between the right bracket and left parenthesis: ]( this is an internal syntax for links"
@@ -461,6 +461,6 @@ @@ -465,6 +465,6 @@
"view.workbench.scm.closedRepository": { "view.workbench.scm.closedRepository": {
- "message": "A Git repository was found that was previously closed.\n[Reopen Closed Repository](command:git.reopenClosedRepositories)\nTo learn more about how to use Git and source control in VS Code [read our docs](https://aka.ms/vscode-scm).", - "message": "A Git repository was found that was previously closed.\n[Reopen Closed Repository](command:git.reopenClosedRepositories)\nTo learn more about how to use Git and source control in VS Code [read our docs](https://aka.ms/vscode-scm).",
+ "message": "A Git repository was found that was previously closed.\n[Reopen Closed Repository](command:git.reopenClosedRepositories)\nTo learn more about how to use Git and source control in !!APP_NAME!! [read our docs](https://aka.ms/vscode-scm).", + "message": "A Git repository was found that was previously closed.\n[Reopen Closed Repository](command:git.reopenClosedRepositories)\nTo learn more about how to use Git and source control in !!APP_NAME!! [read our docs](https://aka.ms/vscode-scm).",
@@ -175,7 +175,7 @@ index 94a1f61..c0ac9ea 100644
- "Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for VS Code", - "Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for VS Code",
+ "Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for !!APP_NAME!!", + "Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for !!APP_NAME!!",
"Please make sure there is no space between the right bracket and left parenthesis: ]( this is an internal syntax for links" "Please make sure there is no space between the right bracket and left parenthesis: ]( this is an internal syntax for links"
@@ -469,6 +469,6 @@ @@ -473,6 +473,6 @@
"view.workbench.scm.closedRepositories": { "view.workbench.scm.closedRepositories": {
- "message": "Git repositories were found that were previously closed.\n[Reopen Closed Repositories](command:git.reopenClosedRepositories)\nTo learn more about how to use Git and source control in VS Code [read our docs](https://aka.ms/vscode-scm).", - "message": "Git repositories were found that were previously closed.\n[Reopen Closed Repositories](command:git.reopenClosedRepositories)\nTo learn more about how to use Git and source control in VS Code [read our docs](https://aka.ms/vscode-scm).",
+ "message": "Git repositories were found that were previously closed.\n[Reopen Closed Repositories](command:git.reopenClosedRepositories)\nTo learn more about how to use Git and source control in !!APP_NAME!! [read our docs](https://aka.ms/vscode-scm).", + "message": "Git repositories were found that were previously closed.\n[Reopen Closed Repositories](command:git.reopenClosedRepositories)\nTo learn more about how to use Git and source control in !!APP_NAME!! [read our docs](https://aka.ms/vscode-scm).",
@@ -184,18 +184,18 @@ index 94a1f61..c0ac9ea 100644
- "Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for VS Code", - "Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for VS Code",
+ "Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for !!APP_NAME!!", + "Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for !!APP_NAME!!",
"Please make sure there is no space between the right bracket and left parenthesis: ]( this is an internal syntax for links" "Please make sure there is no space between the right bracket and left parenthesis: ]( this is an internal syntax for links"
@@ -480,3 +480,3 @@ @@ -484,3 +484,3 @@
"{Locked='](command:git.clone'}", "{Locked='](command:git.clone'}",
- "Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for VS Code", - "Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for VS Code",
+ "Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for !!APP_NAME!!", + "Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for !!APP_NAME!!",
"Please make sure there is no space between the right bracket and left parenthesis: ]( this is an internal syntax for links" "Please make sure there is no space between the right bracket and left parenthesis: ]( this is an internal syntax for links"
@@ -484,3 +484,3 @@ @@ -488,3 +488,3 @@
}, },
- "view.workbench.learnMore": "To learn more about how to use Git and source control in VS Code [read our docs](https://aka.ms/vscode-scm)." - "view.workbench.learnMore": "To learn more about how to use Git and source control in VS Code [read our docs](https://aka.ms/vscode-scm)."
+ "view.workbench.learnMore": "To learn more about how to use Git and source control in !!APP_NAME!! [read our docs](https://aka.ms/vscode-scm)." + "view.workbench.learnMore": "To learn more about how to use Git and source control in !!APP_NAME!! [read our docs](https://aka.ms/vscode-scm)."
} }
diff --git a/extensions/github/package.nls.json b/extensions/github/package.nls.json diff --git a/extensions/github/package.nls.json b/extensions/github/package.nls.json
index 40271be..00dae16 100644 index 4acc8ac..5fa11e4 100644
--- a/extensions/github/package.nls.json --- a/extensions/github/package.nls.json
+++ b/extensions/github/package.nls.json +++ b/extensions/github/package.nls.json
@@ -2,3 +2,3 @@ @@ -2,3 +2,3 @@
@@ -203,17 +203,17 @@ index 40271be..00dae16 100644
- "description": "GitHub features for VS Code", - "description": "GitHub features for VS Code",
+ "description": "GitHub features for !!APP_NAME!!", + "description": "GitHub features for !!APP_NAME!!",
"command.copyVscodeDevLink": "Copy vscode.dev Link", "command.copyVscodeDevLink": "Copy vscode.dev Link",
@@ -8,3 +8,3 @@ @@ -10,3 +10,3 @@
"config.branchProtection": "Controls whether to query repository rules for GitHub repositories", "config.branchProtection": "Controls whether to query repository rules for GitHub repositories",
- "config.gitAuthentication": "Controls whether to enable automatic GitHub authentication for git commands within VS Code.", - "config.gitAuthentication": "Controls whether to enable automatic GitHub authentication for git commands within VS Code.",
+ "config.gitAuthentication": "Controls whether to enable automatic GitHub authentication for git commands within !!APP_NAME!!.", + "config.gitAuthentication": "Controls whether to enable automatic GitHub authentication for git commands within !!APP_NAME!!.",
"config.gitProtocol": "Controls which protocol is used to clone a GitHub repository", "config.gitProtocol": "Controls which protocol is used to clone a GitHub repository",
@@ -17,3 +17,3 @@ @@ -19,3 +19,3 @@
"{Locked='](command:github.publish'}", "{Locked='](command:github.publish'}",
- "Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for VS Code", - "Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for VS Code",
+ "Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for !!APP_NAME!!", + "Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for !!APP_NAME!!",
"Please make sure there is no space between the right bracket and left parenthesis: ]( this is an internal syntax for links" "Please make sure there is no space between the right bracket and left parenthesis: ]( this is an internal syntax for links"
@@ -27,3 +27,3 @@ @@ -29,3 +29,3 @@
"{Locked='](command:github.publish'}", "{Locked='](command:github.publish'}",
- "Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for VS Code", - "Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for VS Code",
+ "Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for !!APP_NAME!!", + "Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for !!APP_NAME!!",
@@ -230,7 +230,7 @@ index 789a579..12e230e 100644
+ "displayName": "Grunt support for !!APP_NAME!!", + "displayName": "Grunt support for !!APP_NAME!!",
"config.grunt.autoDetect": "Controls enablement of Grunt task detection. Grunt task detection can cause files in any open workspace to be executed.", "config.grunt.autoDetect": "Controls enablement of Grunt task detection. Grunt task detection can cause files in any open workspace to be executed.",
diff --git a/extensions/html-language-features/client/src/htmlClient.ts b/extensions/html-language-features/client/src/htmlClient.ts diff --git a/extensions/html-language-features/client/src/htmlClient.ts b/extensions/html-language-features/client/src/htmlClient.ts
index 54fc914..77fa09d 100644 index 250b340..8f53898 100644
--- a/extensions/html-language-features/client/src/htmlClient.ts --- a/extensions/html-language-features/client/src/htmlClient.ts
+++ b/extensions/html-language-features/client/src/htmlClient.ts +++ b/extensions/html-language-features/client/src/htmlClient.ts
@@ -109,3 +109,3 @@ export async function startClient(context: ExtensionContext, newLanguageClient: @@ -109,3 +109,3 @@ export async function startClient(context: ExtensionContext, newLanguageClient:
@@ -359,22 +359,23 @@ index a8bbe5d..00694dc 100644
+ "comment": "The simpler (?<=\\bProcess\\.|\\bCommandLine\\.) breaks !!APP_NAME!! / Atom, see https://github.com/textmate/swift.tmbundle/issues/29", + "comment": "The simpler (?<=\\bProcess\\.|\\bCommandLine\\.) breaks !!APP_NAME!! / Atom, see https://github.com/textmate/swift.tmbundle/issues/29",
"name": "support.variable.swift", "name": "support.variable.swift",
diff --git a/extensions/typescript-language-features/package.nls.json b/extensions/typescript-language-features/package.nls.json diff --git a/extensions/typescript-language-features/package.nls.json b/extensions/typescript-language-features/package.nls.json
index 59a9ea9..7cc82d0 100644 index 97b1c12..4047cac 100644
--- a/extensions/typescript-language-features/package.nls.json --- a/extensions/typescript-language-features/package.nls.json
+++ b/extensions/typescript-language-features/package.nls.json +++ b/extensions/typescript-language-features/package.nls.json
@@ -89,4 +89,4 @@ @@ -130,5 +130,5 @@
"configuration.tsserver.experimental.enableProjectDiagnostics": "Enables project wide error reporting.", "configuration.tsserver.experimental.enableProjectDiagnostics.unifiedDeprecationMessage": "This setting is deprecated. Use `#js/ts.tsserver.experimental.enableProjectDiagnostics#` instead.",
- "typescript.locale": "Sets the locale used to report JavaScript and TypeScript errors. Defaults to use VS Code's locale.", - "typescript.locale": "Sets the locale used to report JavaScript and TypeScript errors. Defaults to use VS Code's locale.",
- "typescript.locale.auto": "Use VS Code's configured display language.",
+ "typescript.locale": "Sets the locale used to report JavaScript and TypeScript errors. Defaults to use !!APP_NAME!!'s locale.", + "typescript.locale": "Sets the locale used to report JavaScript and TypeScript errors. Defaults to use !!APP_NAME!!'s locale.",
"typescript.locale.unifiedDeprecationMessage": "This setting is deprecated. Use `#js/ts.locale#` instead.",
- "typescript.locale.auto": "Use VS Code's configured display language.",
+ "typescript.locale.auto": "Use !!APP_NAME!!'s configured display language.", + "typescript.locale.auto": "Use !!APP_NAME!!'s configured display language.",
"configuration.implicitProjectConfig.module": "Sets the module system for the program. See more: https://www.typescriptlang.org/tsconfig#module.", "configuration.implicitProjectConfig.module": "Sets the module system for the program. See more: https://www.typescriptlang.org/tsconfig#module.",
@@ -197,3 +197,3 @@ @@ -241,3 +241,3 @@
"typescript.workspaceSymbols.excludeLibrarySymbols": "Exclude symbols that come from library files in `Go to Symbol in Workspace` results. Requires using TypeScript 5.3+ in the workspace.", "configuration.workspaceSymbols.excludeLibrarySymbols.unifiedDeprecationMessage": "This setting is deprecated. Use `#js/ts.workspaceSymbols.excludeLibrarySymbols#` instead.",
- "typescript.updateImportsOnFileMove.enabled": "Enable/disable automatic updating of import paths when you rename or move a file in VS Code.", - "typescript.updateImportsOnFileMove.enabled": "Enable/disable automatic updating of import paths when you rename or move a file in VS Code.",
+ "typescript.updateImportsOnFileMove.enabled": "Enable/disable automatic updating of import paths when you rename or move a file in !!APP_NAME!!.", + "typescript.updateImportsOnFileMove.enabled": "Enable/disable automatic updating of import paths when you rename or move a file in !!APP_NAME!!.",
"typescript.updateImportsOnFileMove.enabled.prompt": "Prompt on each rename.", "typescript.updateImportsOnFileMove.enabled.prompt": "Prompt on each rename.",
@@ -206,5 +206,5 @@ @@ -252,5 +252,5 @@
"configuration.suggest.completeJSDocs.unifiedDeprecationMessage": "This setting is deprecated. Use `#js/ts.suggest.completeJSDocs#` instead.", "configuration.suggest.completeJSDocs.unifiedDeprecationMessage": "This setting is deprecated. Use `#js/ts.suggest.completeJSDocs#` instead.",
- "configuration.tsserver.useVsCodeWatcher": "Use VS Code's file watchers instead of TypeScript's. Requires using TypeScript 5.4+ in the workspace.", - "configuration.tsserver.useVsCodeWatcher": "Use VS Code's file watchers instead of TypeScript's. Requires using TypeScript 5.4+ in the workspace.",
+ "configuration.tsserver.useVsCodeWatcher": "Use !!APP_NAME!!'s file watchers instead of TypeScript's. Requires using TypeScript 5.4+ in the workspace.", + "configuration.tsserver.useVsCodeWatcher": "Use !!APP_NAME!!'s file watchers instead of TypeScript's. Requires using TypeScript 5.4+ in the workspace.",
@@ -382,16 +383,17 @@ index 59a9ea9..7cc82d0 100644
- "configuration.tsserver.watchOptions.vscode": "Use VS Code's file watchers instead of TypeScript's. Requires using TypeScript 5.4+ in the workspace.", - "configuration.tsserver.watchOptions.vscode": "Use VS Code's file watchers instead of TypeScript's. Requires using TypeScript 5.4+ in the workspace.",
+ "configuration.tsserver.watchOptions.vscode": "Use !!APP_NAME!!'s file watchers instead of TypeScript's. Requires using TypeScript 5.4+ in the workspace.", + "configuration.tsserver.watchOptions.vscode": "Use !!APP_NAME!!'s file watchers instead of TypeScript's. Requires using TypeScript 5.4+ in the workspace.",
"configuration.tsserver.watchOptions.watchFile": "Strategy for how individual files are watched.", "configuration.tsserver.watchOptions.watchFile": "Strategy for how individual files are watched.",
@@ -260,6 +260,6 @@ @@ -307,3 +307,3 @@
"configuration.suggest.objectLiteralMethodSnippets.enabled.unifiedDeprecationMessage": "This setting is deprecated. Use `#js/ts.suggest.objectLiteralMethodSnippets.enabled#` instead.", "configuration.suggest.objectLiteralMethodSnippets.enabled.unifiedDeprecationMessage": "This setting is deprecated. Use `#js/ts.suggest.objectLiteralMethodSnippets.enabled#` instead.",
- "configuration.tsserver.web.projectWideIntellisense.enabled": "Enable/disable project-wide IntelliSense on web. Requires that VS Code is running in a trusted context.", - "configuration.tsserver.web.projectWideIntellisense.enabled": "Enable/disable project-wide IntelliSense on web. Requires that VS Code is running in a trusted context.",
+ "configuration.tsserver.web.projectWideIntellisense.enabled": "Enable/disable project-wide IntelliSense on web. Requires that !!APP_NAME!! is running in a trusted context.", + "configuration.tsserver.web.projectWideIntellisense.enabled": "Enable/disable project-wide IntelliSense on web. Requires that !!APP_NAME!! is running in a trusted context.",
"configuration.tsserver.web.projectWideIntellisense.suppressSemanticErrors": "Suppresses semantic errors on web even when project wide IntelliSense is enabled. This is always on when project wide IntelliSense is not enabled or available. See `#typescript.tsserver.web.projectWideIntellisense.enabled#`", "configuration.tsserver.web.projectWideIntellisense.enabled.unifiedDeprecationMessage": "This setting is deprecated. Use `#js/ts.tsserver.web.projectWideIntellisense.enabled#` instead.",
"configuration.tsserver.web.typeAcquisition.enabled": "Enable/disable package acquisition on the web. This enables IntelliSense for imported packages. Requires `#typescript.tsserver.web.projectWideIntellisense.enabled#`. Currently not supported for Safari.", @@ -313,3 +313,3 @@
"configuration.tsserver.web.typeAcquisition.enabled.unifiedDeprecationMessage": "This setting is deprecated. Use `#js/ts.tsserver.web.typeAcquisition.enabled#` instead.",
- "configuration.tsserver.nodePath": "Run TS Server on a custom Node installation. This can be a path to a Node executable, or 'node' if you want VS Code to detect a Node installation.", - "configuration.tsserver.nodePath": "Run TS Server on a custom Node installation. This can be a path to a Node executable, or 'node' if you want VS Code to detect a Node installation.",
+ "configuration.tsserver.nodePath": "Run TS Server on a custom Node installation. This can be a path to a Node executable, or 'node' if you want !!APP_NAME!! to detect a Node installation.", + "configuration.tsserver.nodePath": "Run TS Server on a custom Node installation. This can be a path to a Node executable, or 'node' if you want !!APP_NAME!! to detect a Node installation.",
"configuration.updateImportsOnPaste": "Automatically update imports when pasting code. Requires TypeScript 5.6+.", "configuration.tsserver.nodePath.unifiedDeprecationMessage": "This setting is deprecated. Use `#js/ts.tsserver.node.path#` instead.",
@@ -275,7 +275,7 @@ @@ -328,7 +328,7 @@
"walkthroughs.nodejsWelcome.debugJsFile.title": "Run and Debug your JavaScript", "walkthroughs.nodejsWelcome.debugJsFile.title": "Run and Debug your JavaScript",
- "walkthroughs.nodejsWelcome.debugJsFile.description": "Once you've installed Node.js, you can run JavaScript programs at a terminal by entering ``node your-file-name.js``\nAnother easy way to run Node.js programs is by using VS Code's debugger which lets you run your code, pause at different points, and help you understand what's going on step-by-step.\n[Start Debugging](command:javascript-walkthrough.commands.debugJsFile)", - "walkthroughs.nodejsWelcome.debugJsFile.description": "Once you've installed Node.js, you can run JavaScript programs at a terminal by entering ``node your-file-name.js``\nAnother easy way to run Node.js programs is by using VS Code's debugger which lets you run your code, pause at different points, and help you understand what's going on step-by-step.\n[Start Debugging](command:javascript-walkthrough.commands.debugJsFile)",
- "walkthroughs.nodejsWelcome.debugJsFile.altText": "Debug and run your JavaScript code in Node.js with Visual Studio Code.", - "walkthroughs.nodejsWelcome.debugJsFile.altText": "Debug and run your JavaScript code in Node.js with Visual Studio Code.",
@@ -404,10 +406,10 @@ index 59a9ea9..7cc82d0 100644
+ "walkthroughs.nodejsWelcome.learnMoreAboutJs.altText": "Learn more about JavaScript and Node.js in !!APP_NAME!!." + "walkthroughs.nodejsWelcome.learnMoreAboutJs.altText": "Learn more about JavaScript and Node.js in !!APP_NAME!!."
} }
diff --git a/extensions/typescript-language-features/src/tsServer/versionManager.ts b/extensions/typescript-language-features/src/tsServer/versionManager.ts diff --git a/extensions/typescript-language-features/src/tsServer/versionManager.ts b/extensions/typescript-language-features/src/tsServer/versionManager.ts
index dcfee49..35e9ef3 100644 index 8d99637..a8d9986 100644
--- a/extensions/typescript-language-features/src/tsServer/versionManager.ts --- a/extensions/typescript-language-features/src/tsServer/versionManager.ts
+++ b/extensions/typescript-language-features/src/tsServer/versionManager.ts +++ b/extensions/typescript-language-features/src/tsServer/versionManager.ts
@@ -111,3 +111,3 @@ export class TypeScriptVersionManager extends Disposable { @@ -112,3 +112,3 @@ export class TypeScriptVersionManager extends Disposable {
? '• ' ? '• '
- : '') + vscode.l10n.t("Use VS Code's Version"), - : '') + vscode.l10n.t("Use VS Code's Version"),
+ : '') + vscode.l10n.t("Use !!APP_NAME!!'s Version"), + : '') + vscode.l10n.t("Use !!APP_NAME!!'s Version"),
@@ -431,26 +433,26 @@ index 9905fd5..62c2e3c 100644
+ vscode.l10n.t("Please open a folder in !!APP_NAME!! to use a TypeScript or JavaScript project")); + vscode.l10n.t("Please open a folder in !!APP_NAME!! to use a TypeScript or JavaScript project"));
return; return;
diff --git a/extensions/typescript-language-features/src/typescriptServiceClient.ts b/extensions/typescript-language-features/src/typescriptServiceClient.ts diff --git a/extensions/typescript-language-features/src/typescriptServiceClient.ts b/extensions/typescript-language-features/src/typescriptServiceClient.ts
index 207698d..9948527 100644 index 507f9e6..067fb79 100644
--- a/extensions/typescript-language-features/src/typescriptServiceClient.ts --- a/extensions/typescript-language-features/src/typescriptServiceClient.ts
+++ b/extensions/typescript-language-features/src/typescriptServiceClient.ts +++ b/extensions/typescript-language-features/src/typescriptServiceClient.ts
@@ -661,3 +661,3 @@ export default class TypeScriptServiceClient extends Disposable implements IType @@ -660,3 +660,3 @@ export default class TypeScriptServiceClient extends Disposable implements IType
prompt = vscode.window.showErrorMessage<vscode.MessageItem>( prompt = vscode.window.showErrorMessage<vscode.MessageItem>(
- vscode.l10n.t("The JS/TS language service immediately crashed 5 times. The service will not be restarted.\nThis may be caused by a plugin contributed by one of these extensions: {0}.\nPlease try disabling these extensions before filing an issue against VS Code.", pluginExtensionList)); - vscode.l10n.t("The JS/TS language service immediately crashed 5 times. The service will not be restarted.\nThis may be caused by a plugin contributed by one of these extensions: {0}.\nPlease try disabling these extensions before filing an issue against VS Code.", pluginExtensionList));
+ vscode.l10n.t("The JS/TS language service immediately crashed 5 times. The service will not be restarted.\nThis may be caused by a plugin contributed by one of these extensions: {0}.\nPlease try disabling these extensions before filing an issue against !!APP_NAME!!.", pluginExtensionList)); + vscode.l10n.t("The JS/TS language service immediately crashed 5 times. The service will not be restarted.\nThis may be caused by a plugin contributed by one of these extensions: {0}.\nPlease try disabling these extensions before filing an issue against !!APP_NAME!!.", pluginExtensionList));
} else { } else {
@@ -682,3 +682,3 @@ export default class TypeScriptServiceClient extends Disposable implements IType @@ -681,3 +681,3 @@ export default class TypeScriptServiceClient extends Disposable implements IType
prompt = vscode.window.showWarningMessage<vscode.MessageItem>( prompt = vscode.window.showWarningMessage<vscode.MessageItem>(
- vscode.l10n.t("The JS/TS language service crashed 5 times in the last 5 Minutes.\nThis may be caused by a plugin contributed by one of these extensions: {0}\nPlease try disabling these extensions before filing an issue against VS Code.", pluginExtensionList)); - vscode.l10n.t("The JS/TS language service crashed 5 times in the last 5 Minutes.\nThis may be caused by a plugin contributed by one of these extensions: {0}\nPlease try disabling these extensions before filing an issue against VS Code.", pluginExtensionList));
+ vscode.l10n.t("The JS/TS language service crashed 5 times in the last 5 Minutes.\nThis may be caused by a plugin contributed by one of these extensions: {0}\nPlease try disabling these extensions before filing an issue against !!APP_NAME!!.", pluginExtensionList)); + vscode.l10n.t("The JS/TS language service crashed 5 times in the last 5 Minutes.\nThis may be caused by a plugin contributed by one of these extensions: {0}\nPlease try disabling these extensions before filing an issue against !!APP_NAME!!.", pluginExtensionList));
} else { } else {
@@ -696,3 +696,3 @@ export default class TypeScriptServiceClient extends Disposable implements IType @@ -695,3 +695,3 @@ export default class TypeScriptServiceClient extends Disposable implements IType
prompt = vscode.window.showWarningMessage<vscode.MessageItem>( prompt = vscode.window.showWarningMessage<vscode.MessageItem>(
- vscode.l10n.t("The JS/TS language service crashed.\nThis may be caused by a plugin contributed by one of these extensions: {0}.\nPlease try disabling these extensions before filing an issue against VS Code.", pluginExtensionList)); - vscode.l10n.t("The JS/TS language service crashed.\nThis may be caused by a plugin contributed by one of these extensions: {0}.\nPlease try disabling these extensions before filing an issue against VS Code.", pluginExtensionList));
+ vscode.l10n.t("The JS/TS language service crashed.\nThis may be caused by a plugin contributed by one of these extensions: {0}.\nPlease try disabling these extensions before filing an issue against !!APP_NAME!!.", pluginExtensionList)); + vscode.l10n.t("The JS/TS language service crashed.\nThis may be caused by a plugin contributed by one of these extensions: {0}.\nPlease try disabling these extensions before filing an issue against !!APP_NAME!!.", pluginExtensionList));
} else { } else {
diff --git a/extensions/vscode-api-tests/package.json b/extensions/vscode-api-tests/package.json diff --git a/extensions/vscode-api-tests/package.json b/extensions/vscode-api-tests/package.json
index cf23867..f5389b9 100644 index 58ec85b..56e455a 100644
--- a/extensions/vscode-api-tests/package.json --- a/extensions/vscode-api-tests/package.json
+++ b/extensions/vscode-api-tests/package.json +++ b/extensions/vscode-api-tests/package.json
@@ -2,3 +2,3 @@ @@ -2,3 +2,3 @@
@@ -555,10 +557,10 @@ index ec2e45c..8d89e2b 100644
+ ' // This can help in cases where you see rendering issues in !!APP_NAME!!.', + ' // This can help in cases where you see rendering issues in !!APP_NAME!!.',
' // "disable-hardware-acceleration": true', ' // "disable-hardware-acceleration": true',
diff --git a/src/vs/code/electron-main/app.ts b/src/vs/code/electron-main/app.ts diff --git a/src/vs/code/electron-main/app.ts b/src/vs/code/electron-main/app.ts
index 0c6cc59..16d8986 100644 index 7881f73..701a162 100644
--- a/src/vs/code/electron-main/app.ts --- a/src/vs/code/electron-main/app.ts
+++ b/src/vs/code/electron-main/app.ts +++ b/src/vs/code/electron-main/app.ts
@@ -539,3 +539,3 @@ export class CodeApplication extends Disposable { @@ -544,3 +544,3 @@ export class CodeApplication extends Disposable {
async startup(): Promise<void> { async startup(): Promise<void> {
- this.logService.debug('Starting VS Code'); - this.logService.debug('Starting VS Code');
+ this.logService.debug('Starting !!APP_NAME!!'); + this.logService.debug('Starting !!APP_NAME!!');
@@ -613,7 +615,7 @@ index 6346b9d..77ff0f9 100644
+ notices.push(nls.localize('apiProposalMismatch2', "This extension is using the API proposals {0} and '{1}' that are not compatible with the current version of !!APP_NAME!!.", + notices.push(nls.localize('apiProposalMismatch2', "This extension is using the API proposals {0} and '{1}' that are not compatible with the current version of !!APP_NAME!!.",
incompatibleProposals.slice(0, incompatibleProposals.length - 1).map(p => `'${p}'`).join(', '), incompatibleProposals.slice(0, incompatibleProposals.length - 1).map(p => `'${p}'`).join(', '),
diff --git a/src/vs/platform/externalTerminal/node/externalTerminalService.ts b/src/vs/platform/externalTerminal/node/externalTerminalService.ts diff --git a/src/vs/platform/externalTerminal/node/externalTerminalService.ts b/src/vs/platform/externalTerminal/node/externalTerminalService.ts
index 4813da4..9f8fd41 100644 index e7cf3f5..4424cc7 100644
--- a/src/vs/platform/externalTerminal/node/externalTerminalService.ts --- a/src/vs/platform/externalTerminal/node/externalTerminalService.ts
+++ b/src/vs/platform/externalTerminal/node/externalTerminalService.ts +++ b/src/vs/platform/externalTerminal/node/externalTerminalService.ts
@@ -17,3 +17,3 @@ import { ITerminalEnvironment } from '../../terminal/common/terminal.js'; @@ -17,3 +17,3 @@ import { ITerminalEnvironment } from '../../terminal/common/terminal.js';
@@ -631,19 +633,19 @@ index 27fd88b..ad97d7b 100644
+ description: localize('terminal.integrated.inheritEnv', "Whether new shells should inherit their environment from !!APP_NAME!!, which may source a login shell to ensure $PATH and other development variables are initialized. This has no effect on Windows."), + description: localize('terminal.integrated.inheritEnv', "Whether new shells should inherit their environment from !!APP_NAME!!, which may source a login shell to ensure $PATH and other development variables are initialized. This has no effect on Windows."),
type: 'boolean', type: 'boolean',
diff --git a/src/vs/platform/update/common/update.config.contribution.ts b/src/vs/platform/update/common/update.config.contribution.ts diff --git a/src/vs/platform/update/common/update.config.contribution.ts b/src/vs/platform/update/common/update.config.contribution.ts
index 5d1a419..1d7d025 100644 index 93dd62d..550ee91 100644
--- a/src/vs/platform/update/common/update.config.contribution.ts --- a/src/vs/platform/update/common/update.config.contribution.ts
+++ b/src/vs/platform/update/common/update.config.contribution.ts +++ b/src/vs/platform/update/common/update.config.contribution.ts
@@ -70,3 +70,3 @@ configurationRegistry.registerConfiguration({ @@ -70,3 +70,3 @@ configurationRegistry.registerConfiguration({
title: localize('enableWindowsBackgroundUpdatesTitle', "Enable Background Updates on Windows"), title: localize('enableWindowsBackgroundUpdatesTitle', "Enable Background Updates"),
- description: localize('enableWindowsBackgroundUpdates', "Enable to download and install new VS Code versions in the background on Windows."), - description: localize('enableWindowsBackgroundUpdates', "Enable to download and install new VS Code versions in the background."),
+ description: localize('enableWindowsBackgroundUpdates', "Enable to download and install new !!APP_NAME!! versions in the background on Windows."), + description: localize('enableWindowsBackgroundUpdates', "Enable to download and install new !!APP_NAME!! versions in the background."),
included: isWindows && !isWeb included: isWindows && !isWeb
diff --git a/src/vs/platform/update/electron-main/abstractUpdateService.ts b/src/vs/platform/update/electron-main/abstractUpdateService.ts diff --git a/src/vs/platform/update/electron-main/abstractUpdateService.ts b/src/vs/platform/update/electron-main/abstractUpdateService.ts
index 05c4489..f692f24 100644 index 3e5956f..1203e46 100644
--- a/src/vs/platform/update/electron-main/abstractUpdateService.ts --- a/src/vs/platform/update/electron-main/abstractUpdateService.ts
+++ b/src/vs/platform/update/electron-main/abstractUpdateService.ts +++ b/src/vs/platform/update/electron-main/abstractUpdateService.ts
@@ -53,3 +53,3 @@ export type UpdateErrorClassification = { @@ -69,3 +69,3 @@ export type UpdateErrorClassification = {
messageHash: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'The hash of the error message.' }; messageHash: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'The hash of the error message.' };
- comment: 'This is used to know how often VS Code updates have failed.'; - comment: 'This is used to know how often VS Code updates have failed.';
+ comment: 'This is used to know how often !!APP_NAME!! updates have failed.'; + comment: 'This is used to know how often !!APP_NAME!! updates have failed.';
@@ -732,16 +734,16 @@ index e342f83..7c314e6 100644
+ throw new Error('Unable to create the !!APP_NAME!! workbench more than once.'); + throw new Error('Unable to create the !!APP_NAME!! workbench more than once.');
} else { } else {
diff --git a/src/vs/workbench/browser/workbench.contribution.ts b/src/vs/workbench/browser/workbench.contribution.ts diff --git a/src/vs/workbench/browser/workbench.contribution.ts b/src/vs/workbench/browser/workbench.contribution.ts
index b1c5637..3619ee6 100644 index 058693c..9c3afe3 100644
--- a/src/vs/workbench/browser/workbench.contribution.ts --- a/src/vs/workbench/browser/workbench.contribution.ts
+++ b/src/vs/workbench/browser/workbench.contribution.ts +++ b/src/vs/workbench/browser/workbench.contribution.ts
@@ -779,3 +779,3 @@ const registry = Registry.as<IConfigurationRegistry>(ConfigurationExtensions.Con @@ -806,3 +806,3 @@ const registry = Registry.as<IConfigurationRegistry>(ConfigurationExtensions.Con
localize('profileName', "`${profileName}`: name of the profile in which the workspace is opened (e.g. Data Science (Profile)). Ignored if default profile is used."), localize('profileName', "`${profileName}`: name of the profile in which the workspace is opened (e.g. Data Science (Profile)). Ignored if default profile is used."),
- localize('appName', "`${appName}`: e.g. VS Code."), - localize('appName', "`${appName}`: e.g. VS Code."),
+ localize('appName', "`${appName}`: e.g. !!APP_NAME!!."), + localize('appName', "`${appName}`: e.g. !!APP_NAME!!."),
localize('remoteName', "`${remoteName}`: e.g. SSH"), localize('remoteName', "`${remoteName}`: e.g. SSH"),
diff --git a/src/vs/workbench/common/contextkeys.ts b/src/vs/workbench/common/contextkeys.ts diff --git a/src/vs/workbench/common/contextkeys.ts b/src/vs/workbench/common/contextkeys.ts
index 50cc224..7ace915 100644 index c034874..b0bb4a0 100644
--- a/src/vs/workbench/common/contextkeys.ts --- a/src/vs/workbench/common/contextkeys.ts
+++ b/src/vs/workbench/common/contextkeys.ts +++ b/src/vs/workbench/common/contextkeys.ts
@@ -41,3 +41,3 @@ export const EmbedderIdentifierContext = new RawContextKey<string | undefined>(' @@ -41,3 +41,3 @@ export const EmbedderIdentifierContext = new RawContextKey<string | undefined>('
@@ -750,29 +752,29 @@ index 50cc224..7ace915 100644
+export const InAutomationContext = new RawContextKey<boolean>('inAutomation', false, localize('inAutomation', "Whether !!APP_NAME!! is running under automation/smoke test")); +export const InAutomationContext = new RawContextKey<boolean>('inAutomation', false, localize('inAutomation', "Whether !!APP_NAME!! is running under automation/smoke test"));
diff --git a/src/vs/workbench/contrib/chat/browser/chat.contribution.ts b/src/vs/workbench/contrib/chat/browser/chat.contribution.ts diff --git a/src/vs/workbench/contrib/chat/browser/chat.contribution.ts b/src/vs/workbench/contrib/chat/browser/chat.contribution.ts
index 47b9c59..7043d55 100644 index d50fc45..93c4717 100644
--- a/src/vs/workbench/contrib/chat/browser/chat.contribution.ts --- a/src/vs/workbench/contrib/chat/browser/chat.contribution.ts
+++ b/src/vs/workbench/contrib/chat/browser/chat.contribution.ts +++ b/src/vs/workbench/contrib/chat/browser/chat.contribution.ts
@@ -492,3 +492,3 @@ configurationRegistry.registerConfiguration({ @@ -539,3 +539,3 @@ configurationRegistry.registerConfiguration({
nls.localize('chat.mcp.access.none', "No access to MCP servers."), nls.localize('chat.mcp.access.none', "No access to MCP servers."),
- nls.localize('chat.mcp.access.registry', "Allows access to MCP servers installed from the registry that VS Code is connected to."), - nls.localize('chat.mcp.access.registry', "Allows access to MCP servers installed from the registry that VS Code is connected to."),
+ nls.localize('chat.mcp.access.registry', "Allows access to MCP servers installed from the registry that !!APP_NAME!! is connected to."), + nls.localize('chat.mcp.access.registry', "Allows access to MCP servers installed from the registry that !!APP_NAME!! is connected to."),
nls.localize('chat.mcp.access.any', "Allow access to any installed MCP server.") nls.localize('chat.mcp.access.any', "Allow access to any installed MCP server.")
@@ -519,3 +519,3 @@ configurationRegistry.registerConfiguration({ @@ -566,3 +566,3 @@ configurationRegistry.registerConfiguration({
{ {
- key: 'chat.mcp.access.registry', value: nls.localize('chat.mcp.access.registry', "Allows access to MCP servers installed from the registry that VS Code is connected to."), - key: 'chat.mcp.access.registry', value: nls.localize('chat.mcp.access.registry', "Allows access to MCP servers installed from the registry that VS Code is connected to."),
+ key: 'chat.mcp.access.registry', value: nls.localize('chat.mcp.access.registry', "Allows access to MCP servers installed from the registry that !!APP_NAME!! is connected to."), + key: 'chat.mcp.access.registry', value: nls.localize('chat.mcp.access.registry', "Allows access to MCP servers installed from the registry that !!APP_NAME!! is connected to."),
}, },
diff --git a/src/vs/workbench/contrib/chat/browser/chatSetup/chatSetupProviders.ts b/src/vs/workbench/contrib/chat/browser/chatSetup/chatSetupProviders.ts diff --git a/src/vs/workbench/contrib/chat/browser/chatSetup/chatSetupProviders.ts b/src/vs/workbench/contrib/chat/browser/chatSetup/chatSetupProviders.ts
index ed6bad1..7d40581 100644 index 1ff128a..5bfa019 100644
--- a/src/vs/workbench/contrib/chat/browser/chatSetup/chatSetupProviders.ts --- a/src/vs/workbench/contrib/chat/browser/chatSetup/chatSetupProviders.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatSetup/chatSetupProviders.ts +++ b/src/vs/workbench/contrib/chat/browser/chatSetup/chatSetupProviders.ts
@@ -116,3 +116,3 @@ export class SetupAgent extends Disposable implements IChatAgentImplementation { @@ -119,3 +119,3 @@ export class SetupAgent extends Disposable implements IChatAgentImplementation {
// Register VSCode agent // Register VSCode agent
- const { disposable: vscodeDisposable } = SetupAgent.doRegisterAgent(instantiationService, chatAgentService, 'setup.vscode', 'vscode', false, localize2('vscodeAgentDescription', "Ask questions about VS Code").value, ChatAgentLocation.Chat, ChatModeKind.Agent, context, controller); - const { disposable: vscodeDisposable } = SetupAgent.doRegisterAgent(instantiationService, chatAgentService, 'setup.vscode', 'vscode', false, localize2('vscodeAgentDescription', "Ask questions about VS Code").value, ChatAgentLocation.Chat, ChatModeKind.Agent, context, controller);
+ const { disposable: vscodeDisposable } = SetupAgent.doRegisterAgent(instantiationService, chatAgentService, 'setup.vscode', 'vscode', false, localize2('vscodeAgentDescription', "Ask questions about !!APP_NAME!!").value, ChatAgentLocation.Chat, ChatModeKind.Agent, context, controller); + const { disposable: vscodeDisposable } = SetupAgent.doRegisterAgent(instantiationService, chatAgentService, 'setup.vscode', 'vscode', false, localize2('vscodeAgentDescription', "Ask questions about !!APP_NAME!!").value, ChatAgentLocation.Chat, ChatModeKind.Agent, context, controller);
disposables.add(vscodeDisposable); disposables.add(vscodeDisposable);
@@ -133,4 +133,4 @@ export class SetupAgent extends Disposable implements IChatAgentImplementation { @@ -136,4 +136,4 @@ export class SetupAgent extends Disposable implements IChatAgentImplementation {
displayName: localize('setupToolDisplayName', "New Workspace"), displayName: localize('setupToolDisplayName', "New Workspace"),
- modelDescription: 'Scaffold a new workspace in VS Code', - modelDescription: 'Scaffold a new workspace in VS Code',
- userDescription: localize('setupToolsDescription', "Scaffold a new workspace in VS Code"), - userDescription: localize('setupToolsDescription', "Scaffold a new workspace in VS Code"),
@@ -780,10 +782,10 @@ index ed6bad1..7d40581 100644
+ userDescription: localize('setupToolsDescription', "Scaffold a new workspace in !!APP_NAME!!"), + userDescription: localize('setupToolsDescription', "Scaffold a new workspace in !!APP_NAME!!"),
canBeReferencedInPrompt: true, canBeReferencedInPrompt: true,
diff --git a/src/vs/workbench/contrib/chat/common/promptSyntax/languageProviders/promptValidator.ts b/src/vs/workbench/contrib/chat/common/promptSyntax/languageProviders/promptValidator.ts diff --git a/src/vs/workbench/contrib/chat/common/promptSyntax/languageProviders/promptValidator.ts b/src/vs/workbench/contrib/chat/common/promptSyntax/languageProviders/promptValidator.ts
index 55559b5..9ff882b 100644 index a6058e2..63cad20 100644
--- a/src/vs/workbench/contrib/chat/common/promptSyntax/languageProviders/promptValidator.ts --- a/src/vs/workbench/contrib/chat/common/promptSyntax/languageProviders/promptValidator.ts
+++ b/src/vs/workbench/contrib/chat/common/promptSyntax/languageProviders/promptValidator.ts +++ b/src/vs/workbench/contrib/chat/common/promptSyntax/languageProviders/promptValidator.ts
@@ -227,5 +227,5 @@ export class PromptValidator { @@ -230,5 +230,5 @@ export class PromptValidator {
if (validGithubCopilotAttributeNames.value.has(attribute.key)) { if (validGithubCopilotAttributeNames.value.has(attribute.key)) {
- report(toMarker(localize('promptValidator.ignoredAttribute.vscode-agent', "Attribute '{0}' is ignored when running locally in VS Code.", attribute.key), attribute.range, MarkerSeverity.Info)); - report(toMarker(localize('promptValidator.ignoredAttribute.vscode-agent', "Attribute '{0}' is ignored when running locally in VS Code.", attribute.key), attribute.range, MarkerSeverity.Info));
+ report(toMarker(localize('promptValidator.ignoredAttribute.vscode-agent', "Attribute '{0}' is ignored when running locally in !!APP_NAME!!.", attribute.key), attribute.range, MarkerSeverity.Info)); + report(toMarker(localize('promptValidator.ignoredAttribute.vscode-agent', "Attribute '{0}' is ignored when running locally in !!APP_NAME!!.", attribute.key), attribute.range, MarkerSeverity.Info));
@@ -801,7 +803,7 @@ index 0b9ced3..731d952 100644
+ description: nls.localize('debugServer', "For debug extension development only: if a port is specified !!APP_NAME!! tries to connect to a debug adapter running in server mode"), + description: nls.localize('debugServer', "For debug extension development only: if a port is specified !!APP_NAME!! tries to connect to a debug adapter running in server mode"),
default: 4711 default: 4711
diff --git a/src/vs/workbench/contrib/extensions/browser/extensions.contribution.ts b/src/vs/workbench/contrib/extensions/browser/extensions.contribution.ts diff --git a/src/vs/workbench/contrib/extensions/browser/extensions.contribution.ts b/src/vs/workbench/contrib/extensions/browser/extensions.contribution.ts
index 1d28ae5..2f7686c 100644 index 37e6e91..3dcfcf0 100644
--- a/src/vs/workbench/contrib/extensions/browser/extensions.contribution.ts --- a/src/vs/workbench/contrib/extensions/browser/extensions.contribution.ts
+++ b/src/vs/workbench/contrib/extensions/browser/extensions.contribution.ts +++ b/src/vs/workbench/contrib/extensions/browser/extensions.contribution.ts
@@ -362,3 +362,3 @@ CommandsRegistry.registerCommand({ @@ -362,3 +362,3 @@ CommandsRegistry.registerCommand({
@@ -856,7 +858,7 @@ index d1dacd0..035239a 100644
+ this.updateStatus({ icon: warningIcon, message: new MarkdownString(localize('deprecated with alternate settings tooltip', "This extension is deprecated as this functionality is now built-in to !!APP_NAME!!. Configure these {0} to use this functionality.", link)) }, true); + this.updateStatus({ icon: warningIcon, message: new MarkdownString(localize('deprecated with alternate settings tooltip', "This extension is deprecated as this functionality is now built-in to !!APP_NAME!!. Configure these {0} to use this functionality.", link)) }, true);
} else { } else {
diff --git a/src/vs/workbench/contrib/extensions/browser/extensionsWorkbenchService.ts b/src/vs/workbench/contrib/extensions/browser/extensionsWorkbenchService.ts diff --git a/src/vs/workbench/contrib/extensions/browser/extensionsWorkbenchService.ts b/src/vs/workbench/contrib/extensions/browser/extensionsWorkbenchService.ts
index 6735f7f..f860c4f 100644 index de71064..d0035cc 100644
--- a/src/vs/workbench/contrib/extensions/browser/extensionsWorkbenchService.ts --- a/src/vs/workbench/contrib/extensions/browser/extensionsWorkbenchService.ts
+++ b/src/vs/workbench/contrib/extensions/browser/extensionsWorkbenchService.ts +++ b/src/vs/workbench/contrib/extensions/browser/extensionsWorkbenchService.ts
@@ -478,3 +478,3 @@ export class Extension implements IExtension { @@ -478,3 +478,3 @@ export class Extension implements IExtension {
@@ -966,10 +968,10 @@ index 9db6b8a..cecac9f 100644
+ description: nls.localize('JsonSchema.promptOnClose', 'Whether the user is prompted when !!APP_NAME!! closes with a running background task.'), + description: nls.localize('JsonSchema.promptOnClose', 'Whether the user is prompted when !!APP_NAME!! closes with a running background task.'),
default: false default: false
diff --git a/src/vs/workbench/contrib/tasks/common/jsonSchema_v2.ts b/src/vs/workbench/contrib/tasks/common/jsonSchema_v2.ts diff --git a/src/vs/workbench/contrib/tasks/common/jsonSchema_v2.ts b/src/vs/workbench/contrib/tasks/common/jsonSchema_v2.ts
index bdc6eb0..2c90547 100644 index 8d937a1..39e4e20 100644
--- a/src/vs/workbench/contrib/tasks/common/jsonSchema_v2.ts --- a/src/vs/workbench/contrib/tasks/common/jsonSchema_v2.ts
+++ b/src/vs/workbench/contrib/tasks/common/jsonSchema_v2.ts +++ b/src/vs/workbench/contrib/tasks/common/jsonSchema_v2.ts
@@ -433,3 +433,3 @@ const taskConfiguration: IJSONSchema = { @@ -439,3 +439,3 @@ const taskConfiguration: IJSONSchema = {
type: 'boolean', type: 'boolean',
- description: nls.localize('JsonSchema.tasks.promptOnClose', 'Whether the user is prompted when VS Code closes with a running task.'), - description: nls.localize('JsonSchema.tasks.promptOnClose', 'Whether the user is prompted when VS Code closes with a running task.'),
+ description: nls.localize('JsonSchema.tasks.promptOnClose', 'Whether the user is prompted when !!APP_NAME!! closes with a running task.'), + description: nls.localize('JsonSchema.tasks.promptOnClose', 'Whether the user is prompted when !!APP_NAME!! closes with a running task.'),
@@ -1025,7 +1027,7 @@ index a16eaa8..965d80a 100644
+ Write-Host "`e[0m`e[7m * `e[0;103m !!APP_NAME!! Python powershell activation failed with exit code $($activationError.Exception.Message) `e[0m" + Write-Host "`e[0m`e[7m * `e[0;103m !!APP_NAME!! Python powershell activation failed with exit code $($activationError.Exception.Message) `e[0m"
} }
diff --git a/src/vs/workbench/contrib/terminal/common/terminalConfiguration.ts b/src/vs/workbench/contrib/terminal/common/terminalConfiguration.ts diff --git a/src/vs/workbench/contrib/terminal/common/terminalConfiguration.ts b/src/vs/workbench/contrib/terminal/common/terminalConfiguration.ts
index e97facb..a0ace89 100644 index 632938e..8d2a2de 100644
--- a/src/vs/workbench/contrib/terminal/common/terminalConfiguration.ts --- a/src/vs/workbench/contrib/terminal/common/terminalConfiguration.ts
+++ b/src/vs/workbench/contrib/terminal/common/terminalConfiguration.ts +++ b/src/vs/workbench/contrib/terminal/common/terminalConfiguration.ts
@@ -316,3 +316,3 @@ const terminalConfiguration: IStringDictionary<IConfigurationPropertySchema> = { @@ -316,3 +316,3 @@ const terminalConfiguration: IStringDictionary<IConfigurationPropertySchema> = {
@@ -1110,17 +1112,17 @@ index 0f23e5a..27f311e 100644
+ message = localize('terminal.voice.installSpeechExtension', "Would you like to install '!!APP_NAME!! Speech' extension from 'Microsoft'?"); + message = localize('terminal.voice.installSpeechExtension', "Would you like to install '!!APP_NAME!! Speech' extension from 'Microsoft'?");
run = () => commandService.executeCommand('workbench.extensions.installExtension', 'ms-vscode.vscode-speech'); run = () => commandService.executeCommand('workbench.extensions.installExtension', 'ms-vscode.vscode-speech');
diff --git a/src/vs/workbench/contrib/update/browser/update.ts b/src/vs/workbench/contrib/update/browser/update.ts diff --git a/src/vs/workbench/contrib/update/browser/update.ts b/src/vs/workbench/contrib/update/browser/update.ts
index f21d2bb..e8320e2 100644 index 68b982c..dd44414 100644
--- a/src/vs/workbench/contrib/update/browser/update.ts --- a/src/vs/workbench/contrib/update/browser/update.ts
+++ b/src/vs/workbench/contrib/update/browser/update.ts +++ b/src/vs/workbench/contrib/update/browser/update.ts
@@ -631,4 +631,4 @@ export class SwitchProductQualityContribution extends Disposable implements IWor @@ -620,4 +620,4 @@ export class SwitchProductQualityContribution extends Disposable implements IWor
detail: newQuality === 'insider' ? detail: newQuality === 'insider' ?
- nls.localize('relaunchDetailInsiders', "Press the reload button to switch to the Insiders version of VS Code.") : - nls.localize('relaunchDetailInsiders', "Press the reload button to switch to the Insiders version of VS Code.") :
- nls.localize('relaunchDetailStable', "Press the reload button to switch to the Stable version of VS Code."), - nls.localize('relaunchDetailStable', "Press the reload button to switch to the Stable version of VS Code."),
+ nls.localize('relaunchDetailInsiders', "Press the reload button to switch to the Insiders version of !!APP_NAME!!.") : + nls.localize('relaunchDetailInsiders', "Press the reload button to switch to the Insiders version of !!APP_NAME!!.") :
+ nls.localize('relaunchDetailStable', "Press the reload button to switch to the Stable version of !!APP_NAME!!."), + nls.localize('relaunchDetailStable', "Press the reload button to switch to the Stable version of !!APP_NAME!!."),
primaryButton: nls.localize({ key: 'reload', comment: ['&& denotes a mnemonic'] }, "&&Reload") primaryButton: nls.localize({ key: 'reload', comment: ['&& denotes a mnemonic'] }, "&&Reload")
@@ -667,3 +667,3 @@ export class SwitchProductQualityContribution extends Disposable implements IWor @@ -656,3 +656,3 @@ export class SwitchProductQualityContribution extends Disposable implements IWor
message: nls.localize('selectSyncService.message', "Choose the settings sync service to use after changing the version"), message: nls.localize('selectSyncService.message', "Choose the settings sync service to use after changing the version"),
- detail: nls.localize('selectSyncService.detail', "The Insiders version of VS Code will synchronize your settings, keybindings, extensions, snippets and UI State using separate insiders settings sync service by default."), - detail: nls.localize('selectSyncService.detail', "The Insiders version of VS Code will synchronize your settings, keybindings, extensions, snippets and UI State using separate insiders settings sync service by default."),
+ detail: nls.localize('selectSyncService.detail', "The Insiders version of !!APP_NAME!! will synchronize your settings, keybindings, extensions, snippets and UI State using separate insiders settings sync service by default."), + detail: nls.localize('selectSyncService.detail', "The Insiders version of !!APP_NAME!! will synchronize your settings, keybindings, extensions, snippets and UI State using separate insiders settings sync service by default."),
@@ -1346,15 +1348,15 @@ index 1159e4c..d8ebb47 100644
+ markdownDescription: localize('workspace.trust.emptyWindow.description', "Controls whether or not the empty window is trusted by default within !!APP_NAME!!. When used with `#{0}#`, you can enable the full functionality of !!APP_NAME!! without prompting in an empty window.", WORKSPACE_TRUST_UNTRUSTED_FILES), + markdownDescription: localize('workspace.trust.emptyWindow.description', "Controls whether or not the empty window is trusted by default within !!APP_NAME!!. When used with `#{0}#`, you can enable the full functionality of !!APP_NAME!! without prompting in an empty window.", WORKSPACE_TRUST_UNTRUSTED_FILES),
tags: [WORKSPACE_TRUST_SETTING_TAG], tags: [WORKSPACE_TRUST_SETTING_TAG],
diff --git a/src/vs/workbench/electron-browser/desktop.contribution.ts b/src/vs/workbench/electron-browser/desktop.contribution.ts diff --git a/src/vs/workbench/electron-browser/desktop.contribution.ts b/src/vs/workbench/electron-browser/desktop.contribution.ts
index 5fad6f9..4edfd81 100644 index fd09050..ac32743 100644
--- a/src/vs/workbench/electron-browser/desktop.contribution.ts --- a/src/vs/workbench/electron-browser/desktop.contribution.ts
+++ b/src/vs/workbench/electron-browser/desktop.contribution.ts +++ b/src/vs/workbench/electron-browser/desktop.contribution.ts
@@ -447,3 +447,3 @@ import { MAX_ZOOM_LEVEL, MIN_ZOOM_LEVEL } from '../../platform/window/electron-b @@ -448,3 +448,3 @@ import product from '../../platform/product/common/product.js';
type: 'boolean', type: 'boolean',
- description: localize('argv.disableChromiumSandbox', "Disables the Chromium sandbox. This is useful when running VS Code as elevated on Linux and running under Applocker on Windows.") - description: localize('argv.disableChromiumSandbox', "Disables the Chromium sandbox. This is useful when running VS Code as elevated on Linux and running under Applocker on Windows.")
+ description: localize('argv.disableChromiumSandbox', "Disables the Chromium sandbox. This is useful when running !!APP_NAME!! as elevated on Linux and running under Applocker on Windows.") + description: localize('argv.disableChromiumSandbox', "Disables the Chromium sandbox. This is useful when running !!APP_NAME!! as elevated on Linux and running under Applocker on Windows.")
}, },
@@ -451,3 +451,3 @@ import { MAX_ZOOM_LEVEL, MIN_ZOOM_LEVEL } from '../../platform/window/electron-b @@ -452,3 +452,3 @@ import product from '../../platform/product/common/product.js';
type: 'boolean', type: 'boolean',
- description: localize('argv.useInMemorySecretStorage', "Ensures that an in-memory store will be used for secret storage instead of using the OS's credential store. This is often used when running VS Code extension tests or when you're experiencing difficulties with the credential store.") - description: localize('argv.useInMemorySecretStorage', "Ensures that an in-memory store will be used for secret storage instead of using the OS's credential store. This is often used when running VS Code extension tests or when you're experiencing difficulties with the credential store.")
+ description: localize('argv.useInMemorySecretStorage', "Ensures that an in-memory store will be used for secret storage instead of using the OS's credential store. This is often used when running !!APP_NAME!! extension tests or when you're experiencing difficulties with the credential store.") + description: localize('argv.useInMemorySecretStorage', "Ensures that an in-memory store will be used for secret storage instead of using the OS's credential store. This is often used when running !!APP_NAME!! extension tests or when you're experiencing difficulties with the credential store.")
@@ -1369,7 +1371,7 @@ index ea7f364..25c4fda 100644
+ const productName = localize('!!APP_NAME!! for Web', "{0} for the Web", this.productService.nameLong); + const productName = localize('!!APP_NAME!! for Web', "{0} for the Web", this.productService.nameLong);
const virtualWorkspaceSupport = this.extensionManifestPropertiesService.getExtensionVirtualWorkspaceSupportType(manifest); const virtualWorkspaceSupport = this.extensionManifestPropertiesService.getExtensionVirtualWorkspaceSupportType(manifest);
diff --git a/src/vs/workbench/services/extensions/common/extensionsRegistry.ts b/src/vs/workbench/services/extensions/common/extensionsRegistry.ts diff --git a/src/vs/workbench/services/extensions/common/extensionsRegistry.ts b/src/vs/workbench/services/extensions/common/extensionsRegistry.ts
index 6704355..1d58ea0 100644 index 2ea95cd..f91cda9 100644
--- a/src/vs/workbench/services/extensions/common/extensionsRegistry.ts --- a/src/vs/workbench/services/extensions/common/extensionsRegistry.ts
+++ b/src/vs/workbench/services/extensions/common/extensionsRegistry.ts +++ b/src/vs/workbench/services/extensions/common/extensionsRegistry.ts
@@ -181,3 +181,3 @@ export const schema: IJSONSchema = { @@ -181,3 +181,3 @@ export const schema: IJSONSchema = {

55
patches/disable-copilot.patch
View File

@@ -1,29 +1,29 @@
diff --git a/src/vs/workbench/contrib/chat/browser/actions/chatActions.ts b/src/vs/workbench/contrib/chat/browser/actions/chatActions.ts diff --git a/src/vs/workbench/contrib/chat/browser/actions/chatActions.ts b/src/vs/workbench/contrib/chat/browser/actions/chatActions.ts
index 7b64c28..bea3a3f 100644 index d1232f9..51121f9 100644
--- a/src/vs/workbench/contrib/chat/browser/actions/chatActions.ts --- a/src/vs/workbench/contrib/chat/browser/actions/chatActions.ts
+++ b/src/vs/workbench/contrib/chat/browser/actions/chatActions.ts +++ b/src/vs/workbench/contrib/chat/browser/actions/chatActions.ts
@@ -192,3 +192,4 @@ abstract class OpenChatGlobalAction extends Action2 { @@ -204,3 +204,4 @@ abstract class OpenChatGlobalAction extends Action2 {
ChatContextKeys.Setup.hidden.negate(), ChatContextKeys.Setup.hidden.negate(),
- ChatContextKeys.Setup.disabled.negate() - ChatContextKeys.Setup.disabled.negate()
+ ChatContextKeys.Setup.disabled.negate(), + ChatContextKeys.Setup.disabled.negate(),
+ ContextKeyExpr.has('config.chat.disableAIFeatures').negate() + ContextKeyExpr.has('config.chat.disableAIFeatures').negate()
) )
@@ -806,3 +807,3 @@ export function registerChatActions() { @@ -1161,3 +1162,3 @@ export function registerChatActions() {
precondition: ContextKeyExpr.and( precondition: ContextKeyExpr.and(
- ChatContextKeys.Setup.installed, - ChatContextKeys.Setup.installed,
+ ContextKeyExpr.has('config.chat.disableAIFeatures').negate(), + ContextKeyExpr.has('config.chat.disableAIFeatures').negate(),
ChatContextKeys.Setup.disabled.negate(), ChatContextKeys.Setup.disabled.negate(),
@@ -1232,3 +1233,4 @@ MenuRegistry.appendMenuItem(MenuId.EditorContext, { @@ -1692,3 +1693,4 @@ MenuRegistry.appendMenuItem(MenuId.EditorContext, {
ChatContextKeys.Setup.hidden.negate(), ChatContextKeys.Setup.hidden.negate(),
- ChatContextKeys.Setup.disabled.negate() - ChatContextKeys.Setup.disabled.negate()
+ ChatContextKeys.Setup.disabled.negate(), + ChatContextKeys.Setup.disabled.negate(),
+ ContextKeyExpr.has('config.chat.disableAIFeatures').negate() + ContextKeyExpr.has('config.chat.disableAIFeatures').negate()
) )
diff --git a/src/vs/workbench/contrib/chat/browser/chat.contribution.ts b/src/vs/workbench/contrib/chat/browser/chat.contribution.ts diff --git a/src/vs/workbench/contrib/chat/browser/chat.contribution.ts b/src/vs/workbench/contrib/chat/browser/chat.contribution.ts
index d211a1d..cfbcdf5 100644 index d50fc45..ffc8a5b 100644
--- a/src/vs/workbench/contrib/chat/browser/chat.contribution.ts --- a/src/vs/workbench/contrib/chat/browser/chat.contribution.ts
+++ b/src/vs/workbench/contrib/chat/browser/chat.contribution.ts +++ b/src/vs/workbench/contrib/chat/browser/chat.contribution.ts
@@ -969,3 +969,3 @@ configurationRegistry.registerConfiguration({ @@ -1195,3 +1195,3 @@ configurationRegistry.registerConfiguration({
description: nls.localize('chat.disableAIFeatures', "Disable and hide built-in AI features provided by GitHub Copilot, including chat and inline suggestions."), description: nls.localize('chat.disableAIFeatures', "Disable and hide built-in AI features provided by GitHub Copilot, including chat and inline suggestions."),
- default: false, - default: false,
+ default: true, + default: true,
@@ -50,44 +50,59 @@ index ddb5df4..7831288 100644
+ ChatContextKeys.extensionInvalid.negate() + ChatContextKeys.extensionInvalid.negate()
+ ) + )
}; };
diff --git a/src/vs/workbench/contrib/chat/browser/chatSetup/chatSetupContributions.ts b/src/vs/workbench/contrib/chat/browser/chatSetup/chatSetupContributions.ts
index d110a65..226b99d 100644
--- a/src/vs/workbench/contrib/chat/browser/chatSetup/chatSetupContributions.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatSetup/chatSetupContributions.ts
@@ -228,2 +228,3 @@ export class ChatSetupContribution extends Disposable implements IWorkbenchContr
ChatContextKeys.Setup.untrusted,
+ ContextKeyExpr.has('config.chat.disableAIFeatures').negate(),
ChatContextKeys.Setup.installed.negate(),
@@ -345,2 +346,3 @@ export class ChatSetupContribution extends Disposable implements IWorkbenchContr
ChatContextKeys.Setup.hidden.negate(),
+ ContextKeyExpr.has('config.chat.disableAIFeatures').negate(),
ChatContextKeys.Setup.installed.negate(),
@@ -512,2 +514,3 @@ export class ChatSetupContribution extends Disposable implements IWorkbenchContr
ChatContextKeys.Setup.disabled.negate(),
+ ContextKeyExpr.has('config.chat.disableAIFeatures').negate(),
ChatContextKeys.Setup.installed.negate(),
diff --git a/src/vs/workbench/contrib/chat/common/actions/chatContextKeys.ts b/src/vs/workbench/contrib/chat/common/actions/chatContextKeys.ts diff --git a/src/vs/workbench/contrib/chat/common/actions/chatContextKeys.ts b/src/vs/workbench/contrib/chat/common/actions/chatContextKeys.ts
index 9085864..4331066 100644 index 8e703e2..535b1d8 100644
--- a/src/vs/workbench/contrib/chat/common/actions/chatContextKeys.ts --- a/src/vs/workbench/contrib/chat/common/actions/chatContextKeys.ts
+++ b/src/vs/workbench/contrib/chat/common/actions/chatContextKeys.ts +++ b/src/vs/workbench/contrib/chat/common/actions/chatContextKeys.ts
@@ -126,3 +126,3 @@ export namespace ChatContextKeyExprs { @@ -157,3 +157,3 @@ export namespace ChatContextKeyExprs {
export const chatSetupTriggerContext = ContextKeyExpr.or( export const chatSetupTriggerContext = ContextKeyExpr.or(
- ChatContextKeys.Setup.installed.negate(), - ChatContextKeys.Setup.installed.negate(),
+ ContextKeyExpr.has('config.chat.disableAIFeatures').negate(), + ContextKeyExpr.has('config.chat.disableAIFeatures').negate(),
ChatContextKeys.Entitlement.canSignUp ChatContextKeys.Entitlement.canSignUp
diff --git a/src/vs/workbench/contrib/mcp/browser/mcpServersView.ts b/src/vs/workbench/contrib/mcp/browser/mcpServersView.ts diff --git a/src/vs/workbench/contrib/mcp/browser/mcpServersView.ts b/src/vs/workbench/contrib/mcp/browser/mcpServersView.ts
index 7f4dfea..5957267 100644 index 9e82f11..0669f45 100644
--- a/src/vs/workbench/contrib/mcp/browser/mcpServersView.ts --- a/src/vs/workbench/contrib/mcp/browser/mcpServersView.ts
+++ b/src/vs/workbench/contrib/mcp/browser/mcpServersView.ts +++ b/src/vs/workbench/contrib/mcp/browser/mcpServersView.ts
@@ -540,3 +540,3 @@ export class McpServersViewsContribution extends Disposable implements IWorkbenc @@ -554,3 +554,3 @@ export class McpServersViewsContribution extends Disposable implements IWorkbenc
ctorDescriptor: new SyncDescriptor(DefaultBrowseMcpServersView, [{}]), ctorDescriptor: new SyncDescriptor(DefaultBrowseMcpServersView, [{}]),
- when: ContextKeyExpr.and(DefaultViewsContext, HasInstalledMcpServersContext.toNegated(), ChatContextKeys.Setup.hidden.negate(), McpServersGalleryStatusContext.isEqualTo(McpGalleryManifestStatus.Available), ContextKeyExpr.or(ContextKeyDefinedExpr.create(`config.${mcpGalleryServiceUrlConfig}`), ProductQualityContext.notEqualsTo('stable'), ContextKeyDefinedExpr.create(`config.${mcpGalleryServiceEnablementConfig}`))), - when: ContextKeyExpr.and(DefaultViewsContext, HasInstalledMcpServersContext.toNegated(), ChatContextKeys.Setup.hidden.negate(), McpServersGalleryStatusContext.isEqualTo(McpGalleryManifestStatus.Available), ContextKeyExpr.or(ContextKeyDefinedExpr.create(`config.${mcpGalleryServiceUrlConfig}`), ProductQualityContext.notEqualsTo('stable'), ContextKeyDefinedExpr.create(`config.${mcpGalleryServiceEnablementConfig}`))),
+ when: ContextKeyExpr.and(DefaultViewsContext, HasInstalledMcpServersContext.toNegated(), ContextKeyExpr.has('config.chat.disableAIFeatures').negate(), ChatContextKeys.Setup.hidden.negate(), McpServersGalleryStatusContext.isEqualTo(McpGalleryManifestStatus.Available), ContextKeyExpr.or(ContextKeyDefinedExpr.create(`config.${mcpGalleryServiceUrlConfig}`), ProductQualityContext.notEqualsTo('stable'), ContextKeyDefinedExpr.create(`config.${mcpGalleryServiceEnablementConfig}`))), + when: ContextKeyExpr.and(DefaultViewsContext, HasInstalledMcpServersContext.toNegated(), ContextKeyExpr.has('config.chat.disableAIFeatures').negate(), ChatContextKeys.Setup.hidden.negate(), McpServersGalleryStatusContext.isEqualTo(McpGalleryManifestStatus.Available), ContextKeyExpr.or(ContextKeyDefinedExpr.create(`config.${mcpGalleryServiceUrlConfig}`), ProductQualityContext.notEqualsTo('stable'), ContextKeyDefinedExpr.create(`config.${mcpGalleryServiceEnablementConfig}`))),
weight: 40, weight: 40,
@@ -555,3 +555,3 @@ export class McpServersViewsContribution extends Disposable implements IWorkbenc @@ -569,3 +569,3 @@ export class McpServersViewsContribution extends Disposable implements IWorkbenc
ctorDescriptor: new SyncDescriptor(DefaultBrowseMcpServersView, [{ showWelcome: true }]), ctorDescriptor: new SyncDescriptor(DefaultBrowseMcpServersView, [{ showWelcome: true }]),
- when: ContextKeyExpr.and(DefaultViewsContext, HasInstalledMcpServersContext.toNegated(), ChatContextKeys.Setup.hidden.negate(), McpServersGalleryStatusContext.isEqualTo(McpGalleryManifestStatus.Available), ContextKeyDefinedExpr.create(`config.${mcpGalleryServiceUrlConfig}`).negate(), ProductQualityContext.isEqualTo('stable'), ContextKeyDefinedExpr.create(`config.${mcpGalleryServiceEnablementConfig}`).negate()), - when: ContextKeyExpr.and(DefaultViewsContext, HasInstalledMcpServersContext.toNegated(), ChatContextKeys.Setup.hidden.negate(), McpServersGalleryStatusContext.isEqualTo(McpGalleryManifestStatus.Available), ContextKeyDefinedExpr.create(`config.${mcpGalleryServiceUrlConfig}`).negate(), ProductQualityContext.isEqualTo('stable'), ContextKeyDefinedExpr.create(`config.${mcpGalleryServiceEnablementConfig}`).negate()),
+ when: ContextKeyExpr.and(DefaultViewsContext, HasInstalledMcpServersContext.toNegated(), ContextKeyExpr.has('config.chat.disableAIFeatures').negate(), ChatContextKeys.Setup.hidden.negate(), McpServersGalleryStatusContext.isEqualTo(McpGalleryManifestStatus.Available), ContextKeyDefinedExpr.create(`config.${mcpGalleryServiceUrlConfig}`).negate(), ProductQualityContext.isEqualTo('stable'), ContextKeyDefinedExpr.create(`config.${mcpGalleryServiceEnablementConfig}`).negate()), + when: ContextKeyExpr.and(DefaultViewsContext, HasInstalledMcpServersContext.toNegated(), ContextKeyExpr.has('config.chat.disableAIFeatures').negate(), ChatContextKeys.Setup.hidden.negate(), McpServersGalleryStatusContext.isEqualTo(McpGalleryManifestStatus.Available), ContextKeyDefinedExpr.create(`config.${mcpGalleryServiceUrlConfig}`).negate(), ProductQualityContext.isEqualTo('stable'), ContextKeyDefinedExpr.create(`config.${mcpGalleryServiceEnablementConfig}`).negate()),
weight: 40, weight: 40,
diff --git a/src/vs/workbench/contrib/scm/browser/scm.contribution.ts b/src/vs/workbench/contrib/scm/browser/scm.contribution.ts diff --git a/src/vs/workbench/contrib/scm/browser/scm.contribution.ts b/src/vs/workbench/contrib/scm/browser/scm.contribution.ts
index c38dc40..a3e398c 100644 index 8f2ea73..429e28f 100644
--- a/src/vs/workbench/contrib/scm/browser/scm.contribution.ts --- a/src/vs/workbench/contrib/scm/browser/scm.contribution.ts
+++ b/src/vs/workbench/contrib/scm/browser/scm.contribution.ts +++ b/src/vs/workbench/contrib/scm/browser/scm.contribution.ts
@@ -704,3 +704,3 @@ registerAction2(class extends Action2 { @@ -705,3 +705,3 @@ registerAction2(class extends Action2 {
ChatContextKeys.Setup.disabled.negate(), ChatContextKeys.Setup.disabled.negate(),
- ChatContextKeys.Setup.installed.negate(), - ChatContextKeys.Setup.installed.negate(),
+ ContextKeyExpr.has('config.chat.disableAIFeatures').negate(), + ContextKeyExpr.has('config.chat.disableAIFeatures').negate(),
ContextKeyExpr.in(ResourceContextKey.Resource.key, 'git.mergeChanges'), ContextKeyExpr.in(ResourceContextKey.Resource.key, 'git.mergeChanges'),
diff --git a/src/vs/workbench/contrib/scm/browser/scmViewPane.ts b/src/vs/workbench/contrib/scm/browser/scmViewPane.ts diff --git a/src/vs/workbench/contrib/scm/browser/scmInput.ts b/src/vs/workbench/contrib/scm/browser/scmInput.ts
index 012d3c5..2f53955 100644 index bcc312c..f388856 100644
--- a/src/vs/workbench/contrib/scm/browser/scmViewPane.ts --- a/src/vs/workbench/contrib/scm/browser/scmInput.ts
+++ b/src/vs/workbench/contrib/scm/browser/scmViewPane.ts +++ b/src/vs/workbench/contrib/scm/browser/scmInput.ts
@@ -1417,3 +1417,3 @@ registerAction2(class extends Action2 { @@ -848,2 +848,3 @@ registerAction2(class extends Action2 {
ChatContextKeys.Setup.disabled.negate(), ChatContextKeys.Setup.disabled.negate(),
- ChatContextKeys.Setup.installed.negate(),
+ ContextKeyExpr.has('config.chat.disableAIFeatures').negate(), + ContextKeyExpr.has('config.chat.disableAIFeatures').negate(),
ContextKeyExpr.equals('scmProvider', 'git') ChatContextKeys.Setup.installed.negate(),

32
patches/disable-vscodedev.patch
View File

@@ -1,8 +1,8 @@
diff --git a/extensions/github/package.json b/extensions/github/package.json diff --git a/extensions/github/package.json b/extensions/github/package.json
index 726a882..b9a4969 100644 index bce90fe..73debf7 100644
--- a/extensions/github/package.json --- a/extensions/github/package.json
+++ b/extensions/github/package.json +++ b/extensions/github/package.json
@@ -44,19 +44,2 @@ @@ -45,19 +45,2 @@
}, },
- { - {
- "command": "github.copyVscodeDevLink", - "command": "github.copyVscodeDevLink",
@@ -22,7 +22,7 @@ index 726a882..b9a4969 100644
- "icon": "$(globe)" - "icon": "$(globe)"
- }, - },
{ {
@@ -72,11 +55,2 @@ @@ -83,11 +66,2 @@
], ],
- "continueEditSession": [ - "continueEditSession": [
- { - {
@@ -34,7 +34,7 @@ index 726a882..b9a4969 100644
- } - }
- ], - ],
"menus": { "menus": {
@@ -91,18 +65,2 @@ @@ -110,18 +84,2 @@
}, },
- { - {
- "command": "github.copyVscodeDevLink", - "command": "github.copyVscodeDevLink",
@@ -53,7 +53,7 @@ index 726a882..b9a4969 100644
- "when": "false" - "when": "false"
- }, - },
{ {
@@ -112,42 +70,2 @@ @@ -131,42 +89,2 @@
], ],
- "file/share": [ - "file/share": [
- { - {
@@ -97,13 +97,15 @@ index 726a882..b9a4969 100644
- ], - ],
"scm/historyItem/context": [ "scm/historyItem/context": [
diff --git a/extensions/github/src/commands.ts b/extensions/github/src/commands.ts diff --git a/extensions/github/src/commands.ts b/extensions/github/src/commands.ts
index 48e9574..aa853a5 100644 index 33acf5a..107e94a 100644
--- a/extensions/github/src/commands.ts --- a/extensions/github/src/commands.ts
+++ b/extensions/github/src/commands.ts +++ b/extensions/github/src/commands.ts
@@ -9,28 +9,3 @@ import { publishRepository } from './publish.js'; @@ -9,30 +9,5 @@ import { publishRepository } from './publish.js';
import { DisposableStore, getRepositoryFromUrl } from './util.js'; import { DisposableStore, getRepositoryFromUrl } from './util.js';
-import { LinkContext, getCommitLink, getLink, getVscodeDevHost } from './links.js'; -import { LinkContext, getCommitLink, getLink, getVscodeDevHost } from './links.js';
- +import { getCommitLink } from './links.js';
import { getOctokit } from './auth.js';
-async function copyVscodeDevLink(gitAPI: GitAPI, useSelection: boolean, context: LinkContext, includeRange = true) { -async function copyVscodeDevLink(gitAPI: GitAPI, useSelection: boolean, context: LinkContext, includeRange = true) {
- try { - try {
- const permalink = await getLink(gitAPI, useSelection, true, getVscodeDevHost(), 'headlink', context, includeRange); - const permalink = await getLink(gitAPI, useSelection, true, getVscodeDevHost(), 'headlink', context, includeRange);
@@ -128,9 +130,9 @@ index 48e9574..aa853a5 100644
- return undefined; - return undefined;
- } - }
-} -}
+import { getCommitLink } from './links.js'; -
interface ResolvedSessionRepo {
@@ -70,14 +45,2 @@ export function registerCommands(gitAPI: GitAPI): vscode.Disposable { @@ -210,14 +185,2 @@ export function registerCommands(gitAPI: GitAPI): vscode.Disposable {
- disposables.add(vscode.commands.registerCommand('github.copyVscodeDevLink', async (context: LinkContext) => { - disposables.add(vscode.commands.registerCommand('github.copyVscodeDevLink', async (context: LinkContext) => {
- return copyVscodeDevLink(gitAPI, true, context); - return copyVscodeDevLink(gitAPI, true, context);
@@ -145,13 +147,13 @@ index 48e9574..aa853a5 100644
- })); - }));
- -
disposables.add(vscode.commands.registerCommand('github.openOnGitHub', async (url: string, historyItemId: string) => { disposables.add(vscode.commands.registerCommand('github.openOnGitHub', async (url: string, historyItemId: string) => {
@@ -113,6 +76,2 @@ export function registerCommands(gitAPI: GitAPI): vscode.Disposable { @@ -253,6 +216,2 @@ export function registerCommands(gitAPI: GitAPI): vscode.Disposable {
- disposables.add(vscode.commands.registerCommand('github.openOnVscodeDev', async () => { - disposables.add(vscode.commands.registerCommand('github.openOnVscodeDev', async () => {
- return openVscodeDevLink(gitAPI); - return openVscodeDevLink(gitAPI);
- })); - }));
- -
return disposables; disposables.add(vscode.commands.registerCommand('github.createPullRequest', async (sessionResource: vscode.Uri | undefined, sessionMetadata: { worktreePath?: string } | undefined) => {
diff --git a/extensions/github/src/extension.ts b/extensions/github/src/extension.ts diff --git a/extensions/github/src/extension.ts b/extensions/github/src/extension.ts
index 17906c5..86a0ca8 100644 index 17906c5..86a0ca8 100644
--- a/extensions/github/src/extension.ts --- a/extensions/github/src/extension.ts
@@ -165,7 +167,7 @@ index 17906c5..86a0ca8 100644
- disposables.add(new VscodeDevShareProvider(gitAPI)); - disposables.add(new VscodeDevShareProvider(gitAPI));
setGitHubContext(gitAPI, disposables); setGitHubContext(gitAPI, disposables);
diff --git a/extensions/github/src/remoteSourceProvider.ts b/extensions/github/src/remoteSourceProvider.ts diff --git a/extensions/github/src/remoteSourceProvider.ts b/extensions/github/src/remoteSourceProvider.ts
index 291a3f1..6304ed8 100644 index bed2bb1..2880f97 100644
--- a/extensions/github/src/remoteSourceProvider.ts --- a/extensions/github/src/remoteSourceProvider.ts
+++ b/extensions/github/src/remoteSourceProvider.ts +++ b/extensions/github/src/remoteSourceProvider.ts
@@ -10,3 +10,3 @@ import { Octokit } from '@octokit/rest'; @@ -10,3 +10,3 @@ import { Octokit } from '@octokit/rest';
@@ -173,7 +175,7 @@ index 291a3f1..6304ed8 100644
-import { getBranchLink, getVscodeDevHost } from './links.js'; -import { getBranchLink, getVscodeDevHost } from './links.js';
+import { getBranchLink } from './links.js'; +import { getBranchLink } from './links.js';
@@ -129,9 +129,2 @@ export class GithubRemoteSourceProvider implements RemoteSourceProvider { @@ -137,9 +137,2 @@ export class GithubRemoteSourceProvider implements RemoteSourceProvider {
} }
- }, { - }, {
- label: l10n.t('Checkout on vscode.dev'), - label: l10n.t('Checkout on vscode.dev'),

102
patches/feat-experimental-font.patch
View File

@@ -110,7 +110,7 @@ index 827a19f..43a1996 100644
+} +}
\ No newline at end of file \ No newline at end of file
diff --git a/src/vs/base/browser/ui/selectBox/selectBox.css b/src/vs/base/browser/ui/selectBox/selectBox.css diff --git a/src/vs/base/browser/ui/selectBox/selectBox.css b/src/vs/base/browser/ui/selectBox/selectBox.css
index 2b0011a..327fe0f 100644 index fd4d00e..92ddc99 100644
--- a/src/vs/base/browser/ui/selectBox/selectBox.css --- a/src/vs/base/browser/ui/selectBox/selectBox.css
+++ b/src/vs/base/browser/ui/selectBox/selectBox.css +++ b/src/vs/base/browser/ui/selectBox/selectBox.css
@@ -35 +35,16 @@ @@ -35 +35,16 @@
@@ -951,7 +951,7 @@ index 328285f..0735dfa 100644
+ return FONT.sidebarSize22; + return FONT.sidebarSize22;
} }
diff --git a/src/vs/workbench/browser/media/style.css b/src/vs/workbench/browser/media/style.css diff --git a/src/vs/workbench/browser/media/style.css b/src/vs/workbench/browser/media/style.css
index 13ff794..57ad58c 100644 index 7537f93..5a7a277 100644
--- a/src/vs/workbench/browser/media/style.css --- a/src/vs/workbench/browser/media/style.css
+++ b/src/vs/workbench/browser/media/style.css +++ b/src/vs/workbench/browser/media/style.css
@@ -11,20 +11,20 @@ @@ -11,20 +11,20 @@
@@ -996,7 +996,7 @@ index 13ff794..57ad58c 100644
+ font-family: var(--vscode-workbench-font-family, var(--monaco-font)); + font-family: var(--vscode-workbench-font-family, var(--monaco-font));
+ font-size: var(--vscode-workbench-font-size, 13px); + font-size: var(--vscode-workbench-font-size, 13px);
} }
@@ -322 +324,41 @@ body { @@ -323 +325,41 @@ body {
} }
+ +
+ +
@@ -2199,10 +2199,10 @@ index 1c9305b..6471a0d 100644
- static readonly ITEM_HEIGHT = 22; - static readonly ITEM_HEIGHT = 22;
static readonly TREE_TEMPLATE_ID = 'treeExplorer'; static readonly TREE_TEMPLATE_ID = 'treeExplorer';
diff --git a/src/vs/workbench/browser/workbench.contribution.ts b/src/vs/workbench/browser/workbench.contribution.ts diff --git a/src/vs/workbench/browser/workbench.contribution.ts b/src/vs/workbench/browser/workbench.contribution.ts
index b1c5637..2f8c047 100644 index 058693c..ee81a59 100644
--- a/src/vs/workbench/browser/workbench.contribution.ts --- a/src/vs/workbench/browser/workbench.contribution.ts
+++ b/src/vs/workbench/browser/workbench.contribution.ts +++ b/src/vs/workbench/browser/workbench.contribution.ts
@@ -675,2 +675,85 @@ const registry = Registry.as<IConfigurationRegistry>(ConfigurationExtensions.Con @@ -702,2 +702,85 @@ const registry = Registry.as<IConfigurationRegistry>(ConfigurationExtensions.Con
}, },
+ 'workbench.experimental.fontFamily': { + 'workbench.experimental.fontFamily': {
+ type: 'string', + type: 'string',
@@ -2382,16 +2382,16 @@ index 6f58865..3ab0ee4 100644
+ return FONT.sidebarSize22; + return FONT.sidebarSize22;
} }
diff --git a/src/vs/workbench/contrib/chat/browser/agentSessions/agentSessionsViewer.ts b/src/vs/workbench/contrib/chat/browser/agentSessions/agentSessionsViewer.ts diff --git a/src/vs/workbench/contrib/chat/browser/agentSessions/agentSessionsViewer.ts b/src/vs/workbench/contrib/chat/browser/agentSessions/agentSessionsViewer.ts
index 2a89832..d2cfdbf 100644 index eb17488..1a005a7 100644
--- a/src/vs/workbench/contrib/chat/browser/agentSessions/agentSessionsViewer.ts --- a/src/vs/workbench/contrib/chat/browser/agentSessions/agentSessionsViewer.ts
+++ b/src/vs/workbench/contrib/chat/browser/agentSessions/agentSessionsViewer.ts +++ b/src/vs/workbench/contrib/chat/browser/agentSessions/agentSessionsViewer.ts
@@ -45,2 +45,3 @@ import { AgentSessionProviders, getAgentSessionTime } from './agentSessions.js'; @@ -45,2 +45,3 @@ import { AgentSessionProviders, getAgentSessionTime } from './agentSessions.js';
import { AgentSessionsGrouping } from './agentSessionsFilter.js'; import { AgentSessionsGrouping } from './agentSessionsFilter.js';
+import { FONT } from '../../../../../base/common/font.js'; +import { FONT } from '../../../../../base/common/font.js';
@@ -504,11 +505,8 @@ export class AgentSessionsListDelegate implements IListVirtualDelegate<AgentSess @@ -508,11 +509,8 @@ export class AgentSessionsListDelegate implements IListVirtualDelegate<AgentSess
- static readonly ITEM_HEIGHT = 44; - static readonly ITEM_HEIGHT = 54;
- static readonly SECTION_HEIGHT = 26; - static readonly SECTION_HEIGHT = 26;
- -
getHeight(element: AgentSessionListItem): number { getHeight(element: AgentSessionListItem): number {
@@ -2417,14 +2417,14 @@ index ad2c82a..6cb6bce 100644
+ return FONT.sidebarSize22; + return FONT.sidebarSize22;
} }
diff --git a/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatChangesSummaryPart.ts b/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatChangesSummaryPart.ts diff --git a/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatChangesSummaryPart.ts b/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatChangesSummaryPart.ts
index 4fd9d3e..fce1aad 100644 index cc7bb15..f260d0e 100644
--- a/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatChangesSummaryPart.ts --- a/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatChangesSummaryPart.ts
+++ b/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatChangesSummaryPart.ts +++ b/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatChangesSummaryPart.ts
@@ -34,2 +34,3 @@ import { ResourcePool } from './chatCollections.js'; @@ -33,2 +33,3 @@ import { ResourcePool } from './chatCollections.js';
import { IChatContentPart, IChatContentPartRenderContext } from './chatContentParts.js'; import { IChatContentPart, IChatContentPartRenderContext } from './chatContentParts.js';
+import { FONT } from '../../../../../../base/common/font.js'; +import { FONT } from '../../../../../../base/common/font.js';
@@ -246,3 +247,3 @@ class CollapsibleChangesSummaryListDelegate implements IListVirtualDelegate<IEdi @@ -244,3 +245,3 @@ class CollapsibleChangesSummaryListDelegate implements IListVirtualDelegate<IEdi
getHeight(element: IEditSessionEntryDiff): number { getHeight(element: IEditSessionEntryDiff): number {
- return 22; - return 22;
+ return FONT.sidebarSize22; + return FONT.sidebarSize22;
@@ -2443,14 +2443,14 @@ index 15ae799..06a95d5 100644
+ return FONT.sidebarSize22; + return FONT.sidebarSize22;
} }
diff --git a/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatReferencesContentPart.ts b/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatReferencesContentPart.ts diff --git a/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatReferencesContentPart.ts b/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatReferencesContentPart.ts
index d62abbb..5d7359f 100644 index 6ff8637..7694134 100644
--- a/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatReferencesContentPart.ts --- a/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatReferencesContentPart.ts
+++ b/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatReferencesContentPart.ts +++ b/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatReferencesContentPart.ts
@@ -49,2 +49,3 @@ import { IChatContentPartRenderContext } from './chatContentParts.js'; @@ -50,2 +50,3 @@ import { IHoverService } from '../../../../../../platform/hover/browser/hover.js
import { IHoverService } from '../../../../../../platform/hover/browser/hover.js'; import { IConfigurationService } from '../../../../../../platform/configuration/common/configuration.js';
+import { FONT } from '../../../../../../base/common/font.js'; +import { FONT } from '../../../../../../base/common/font.js';
@@ -293,3 +294,3 @@ class CollapsibleListDelegate implements IListVirtualDelegate<IChatCollapsibleLi @@ -297,3 +298,3 @@ class CollapsibleListDelegate implements IListVirtualDelegate<IChatCollapsibleLi
getHeight(element: IChatCollapsibleListItem): number { getHeight(element: IChatCollapsibleListItem): number {
- return 22; - return 22;
+ return FONT.sidebarSize22; + return FONT.sidebarSize22;
@@ -2720,10 +2720,10 @@ index 090c53e..d5c4b9f 100644
+} +}
\ No newline at end of file \ No newline at end of file
diff --git a/src/vs/workbench/contrib/debug/browser/media/debugViewlet.css b/src/vs/workbench/contrib/debug/browser/media/debugViewlet.css diff --git a/src/vs/workbench/contrib/debug/browser/media/debugViewlet.css b/src/vs/workbench/contrib/debug/browser/media/debugViewlet.css
index f6ca5b3..ac13e94 100644 index 4a627af..a07c974 100644
--- a/src/vs/workbench/contrib/debug/browser/media/debugViewlet.css --- a/src/vs/workbench/contrib/debug/browser/media/debugViewlet.css
+++ b/src/vs/workbench/contrib/debug/browser/media/debugViewlet.css +++ b/src/vs/workbench/contrib/debug/browser/media/debugViewlet.css
@@ -370 +370,90 @@ @@ -371 +371,90 @@
} }
+ +
+ +
@@ -2855,7 +2855,7 @@ index 3cd48a5..3238df4 100644
+ getHeight() { return FONT.sidebarSize22; } + getHeight() { return FONT.sidebarSize22; }
getTemplateId() { return 'extensionFeatureDescriptor'; } getTemplateId() { return 'extensionFeatureDescriptor'; }
diff --git a/src/vs/workbench/contrib/extensions/browser/extensionsList.ts b/src/vs/workbench/contrib/extensions/browser/extensionsList.ts diff --git a/src/vs/workbench/contrib/extensions/browser/extensionsList.ts b/src/vs/workbench/contrib/extensions/browser/extensionsList.ts
index 95226c5..dcea716 100644 index 42134f0..4e14bd1 100644
--- a/src/vs/workbench/contrib/extensions/browser/extensionsList.ts --- a/src/vs/workbench/contrib/extensions/browser/extensionsList.ts
+++ b/src/vs/workbench/contrib/extensions/browser/extensionsList.ts +++ b/src/vs/workbench/contrib/extensions/browser/extensionsList.ts
@@ -27,4 +27,3 @@ import { IActionViewItemOptions } from '../../../../base/browser/ui/actionbar/ac @@ -27,4 +27,3 @@ import { IActionViewItemOptions } from '../../../../base/browser/ui/actionbar/ac
@@ -2883,14 +2883,14 @@ index 418cb12..fbb30c5 100644
+ return FONT.sidebarSize62; + return FONT.sidebarSize62;
} }
diff --git a/src/vs/workbench/contrib/extensions/browser/extensionsViewlet.ts b/src/vs/workbench/contrib/extensions/browser/extensionsViewlet.ts diff --git a/src/vs/workbench/contrib/extensions/browser/extensionsViewlet.ts b/src/vs/workbench/contrib/extensions/browser/extensionsViewlet.ts
index 6b63799..9cec063 100644 index 8bfac42..6430bf4 100644
--- a/src/vs/workbench/contrib/extensions/browser/extensionsViewlet.ts --- a/src/vs/workbench/contrib/extensions/browser/extensionsViewlet.ts
+++ b/src/vs/workbench/contrib/extensions/browser/extensionsViewlet.ts +++ b/src/vs/workbench/contrib/extensions/browser/extensionsViewlet.ts
@@ -72,2 +72,3 @@ import { DEFAULT_ACCOUNT_SIGN_IN_COMMAND } from '../../../services/accounts/brow @@ -69,2 +69,3 @@ import { URI } from '../../../../base/common/uri.js';
import { IHoverService } from '../../../../platform/hover/browser/hover.js'; import { DEFAULT_ACCOUNT_SIGN_IN_COMMAND } from '../../../services/accounts/browser/defaultAccount.js';
+import { FONT } from '../../../../base/common/font.js'; +import { FONT } from '../../../../base/common/font.js';
@@ -727,5 +728,5 @@ export class ExtensionsViewPaneContainer extends ViewPaneContainer<IExtensionsVi @@ -735,5 +736,5 @@ export class ExtensionsViewPaneContainer extends ViewPaneContainer<IExtensionsVi
} }
- this.searchBox?.layout(new Dimension(dimension.width - 34 - /*padding*/8 - (24 * 2), 20)); - this.searchBox?.layout(new Dimension(dimension.width - 34 - /*padding*/8 - (24 * 2), 20));
- const searchBoxHeight = 20 + 21 /*margin*/; - const searchBoxHeight = 20 + 21 /*margin*/;
@@ -2900,10 +2900,10 @@ index 6b63799..9cec063 100644
+ const headerHeight = this.header && !!this.notificationContainer?.childNodes.length ? this.notificationContainer.clientHeight + searchBoxHeight + FONT.sidebarSize10 /*margin*/ : searchBoxHeight; + const headerHeight = this.header && !!this.notificationContainer?.childNodes.length ? this.notificationContainer.clientHeight + searchBoxHeight + FONT.sidebarSize10 /*margin*/ : searchBoxHeight;
this.header!.style.height = `${headerHeight}px`; this.header!.style.height = `${headerHeight}px`;
diff --git a/src/vs/workbench/contrib/extensions/browser/media/extension.css b/src/vs/workbench/contrib/extensions/browser/media/extension.css diff --git a/src/vs/workbench/contrib/extensions/browser/media/extension.css b/src/vs/workbench/contrib/extensions/browser/media/extension.css
index d581283..7ab0492 100644 index 8454447..bf4b116 100644
--- a/src/vs/workbench/contrib/extensions/browser/media/extension.css --- a/src/vs/workbench/contrib/extensions/browser/media/extension.css
+++ b/src/vs/workbench/contrib/extensions/browser/media/extension.css +++ b/src/vs/workbench/contrib/extensions/browser/media/extension.css
@@ -281 +281,83 @@ @@ -302 +302,83 @@
} }
+ +
+ +
@@ -3455,19 +3455,44 @@ index 1523a82..fe78847 100644
+ return FONT.sidebarSize22; + return FONT.sidebarSize22;
} }
diff --git a/src/vs/workbench/contrib/scm/browser/scmViewPane.ts b/src/vs/workbench/contrib/scm/browser/scmViewPane.ts diff --git a/src/vs/workbench/contrib/scm/browser/scmViewPane.ts b/src/vs/workbench/contrib/scm/browser/scmViewPane.ts
index dd3439f..2120b2f 100644 index a2887d4..5e81511 100644
--- a/src/vs/workbench/contrib/scm/browser/scmViewPane.ts --- a/src/vs/workbench/contrib/scm/browser/scmViewPane.ts
+++ b/src/vs/workbench/contrib/scm/browser/scmViewPane.ts +++ b/src/vs/workbench/contrib/scm/browser/scmViewPane.ts
@@ -113,2 +113,3 @@ import product from '../../../../platform/product/common/product.js'; @@ -77,2 +77,3 @@ import { AccessibilityCommandId } from '../../accessibility/common/accessibility
import { CHAT_SETUP_SUPPORT_ANONYMOUS_ACTION_ID } from '../../chat/browser/actions/chatActions.js'; import { SCMInputWidget } from './scmInput.js';
+import { FONT } from '../../../../base/common/font.js'; +import { FONT } from '../../../../base/common/font.js';
@@ -179,4 +180,2 @@ interface ActionButtonTemplate { @@ -143,4 +144,2 @@ interface ActionButtonTemplate {
export class ActionButtonRenderer implements ICompressibleTreeRenderer<ISCMActionButton, FuzzyScore, ActionButtonTemplate> { export class ActionButtonRenderer implements ICompressibleTreeRenderer<ISCMActionButton, FuzzyScore, ActionButtonTemplate> {
- static readonly DEFAULT_HEIGHT = 28; - static readonly DEFAULT_HEIGHT = 28;
- -
static readonly TEMPLATE_ID = 'actionButton'; static readonly TEMPLATE_ID = 'actionButton';
@@ -715,5 +714,5 @@ class ListDelegate implements IListVirtualDelegate<TreeElement> { @@ -261,4 +260,2 @@ class InputRenderer implements ICompressibleTreeRenderer<ISCMInput, FuzzyScore,
- static readonly DEFAULT_HEIGHT = 26;
-
static readonly TEMPLATE_ID = 'input';
@@ -286,3 +283,3 @@ class InputRenderer implements ICompressibleTreeRenderer<ISCMInput, FuzzyScore,
- return { inputWidget, inputWidgetHeight: InputRenderer.DEFAULT_HEIGHT, elementDisposables: new DisposableStore(), templateDisposable };
+ return { inputWidget, inputWidgetHeight: FONT.sidebarSize26, elementDisposables: new DisposableStore(), templateDisposable };
}
@@ -315,3 +312,3 @@ class InputRenderer implements ICompressibleTreeRenderer<ISCMInput, FuzzyScore,
// Reset widget height so it's recalculated
- templateData.inputWidgetHeight = InputRenderer.DEFAULT_HEIGHT;
+ templateData.inputWidgetHeight = FONT.sidebarSize26;
@@ -323,3 +320,3 @@ class InputRenderer implements ICompressibleTreeRenderer<ISCMInput, FuzzyScore,
if (templateData.inputWidgetHeight !== contentHeight) {
- this.updateHeight(input, contentHeight + 10);
+ this.updateHeight(input, contentHeight + FONT.sidebarSize8);
templateData.inputWidgetHeight = contentHeight;
@@ -357,3 +354,3 @@ class InputRenderer implements ICompressibleTreeRenderer<ISCMInput, FuzzyScore,
getHeight(input: ISCMInput): number {
- return (this.contentHeights.get(input) ?? InputRenderer.DEFAULT_HEIGHT) + 10;
+ return (this.contentHeights.get(input) ?? FONT.sidebarSize26) + FONT.sidebarSize10;
}
@@ -679,5 +676,5 @@ class ListDelegate implements IListVirtualDelegate<TreeElement> {
} else if (isSCMActionButton(element)) { } else if (isSCMActionButton(element)) {
- return ActionButtonRenderer.DEFAULT_HEIGHT + 8; - return ActionButtonRenderer.DEFAULT_HEIGHT + 8;
+ return FONT.sidebarSize28 + 8; + return FONT.sidebarSize28 + 8;
@@ -3475,15 +3500,8 @@ index dd3439f..2120b2f 100644
- return 22; - return 22;
+ return FONT.sidebarSize22; + return FONT.sidebarSize22;
} }
@@ -2171,4 +2170,4 @@ class SCMInputWidget {
return this.toolbar.dropdownActions.length === 0 ?
- 26 /* 22px action + 4px margin */ :
- 39 /* 35px action + 4px margin */;
+ FONT.sidebarSize26 /* 22px action + 4px margin */ :
+ FONT.sidebarSize39 /* 35px action + 4px margin */;
}
diff --git a/src/vs/workbench/contrib/search/browser/media/searchview.css b/src/vs/workbench/contrib/search/browser/media/searchview.css diff --git a/src/vs/workbench/contrib/search/browser/media/searchview.css b/src/vs/workbench/contrib/search/browser/media/searchview.css
index e493fe3..647d2e6 100644 index 47e85d6..466cf3d 100644
--- a/src/vs/workbench/contrib/search/browser/media/searchview.css --- a/src/vs/workbench/contrib/search/browser/media/searchview.css
+++ b/src/vs/workbench/contrib/search/browser/media/searchview.css +++ b/src/vs/workbench/contrib/search/browser/media/searchview.css
@@ -443 +443,110 @@ @@ -443 +443,110 @@
@@ -3719,14 +3737,14 @@ index 631bd2a..902bb81 100644
+ let delta = Math.max(0, evt.scrollTop - (this.hasMultipleFrames ? FONT.sidebarSize24 : 0)); + let delta = Math.max(0, evt.scrollTop - (this.hasMultipleFrames ? FONT.sidebarSize24 : 0));
delta = Math.min(Math.max(0, this.contentHeight - this.viewHeight), delta); delta = Math.min(Math.max(0, this.contentHeight - this.viewHeight), delta);
diff --git a/src/vs/workbench/contrib/testing/browser/testingExplorerView.ts b/src/vs/workbench/contrib/testing/browser/testingExplorerView.ts diff --git a/src/vs/workbench/contrib/testing/browser/testingExplorerView.ts b/src/vs/workbench/contrib/testing/browser/testingExplorerView.ts
index ef75da6..cff2356 100644 index 9257aa6..3819205 100644
--- a/src/vs/workbench/contrib/testing/browser/testingExplorerView.ts --- a/src/vs/workbench/contrib/testing/browser/testingExplorerView.ts
+++ b/src/vs/workbench/contrib/testing/browser/testingExplorerView.ts +++ b/src/vs/workbench/contrib/testing/browser/testingExplorerView.ts
@@ -85,2 +85,3 @@ import { DebugLastRun, ReRunLastRun } from './testExplorerActions.js'; @@ -85,2 +85,3 @@ import { DebugLastRun, ReRunLastRun } from './testExplorerActions.js';
import { TestingExplorerFilter } from './testingExplorerFilter.js'; import { TestingExplorerFilter } from './testingExplorerFilter.js';
+import { FONT } from '../../../../base/common/font.js'; +import { FONT } from '../../../../base/common/font.js';
@@ -1421,3 +1422,3 @@ class ListDelegate implements IListVirtualDelegate<TestExplorerTreeElement> { @@ -1427,3 +1428,3 @@ class ListDelegate implements IListVirtualDelegate<TestExplorerTreeElement> {
getHeight(element: TestExplorerTreeElement) { getHeight(element: TestExplorerTreeElement) {
- return element instanceof TestTreeErrorMessage ? 17 + 10 : 22; - return element instanceof TestTreeErrorMessage ? 17 + 10 : 22;
+ return element instanceof TestTreeErrorMessage ? FONT.sidebarSize17 + 10 : FONT.sidebarSize22; + return element instanceof TestTreeErrorMessage ? FONT.sidebarSize17 + 10 : FONT.sidebarSize22;
@@ -3765,7 +3783,7 @@ index 27c6580..0feb646 100644
+ return FONT.sidebarSize22; + return FONT.sidebarSize22;
} }
diff --git a/src/vs/workbench/contrib/welcomeAgentSessions/browser/agentSessionsWelcome.ts b/src/vs/workbench/contrib/welcomeAgentSessions/browser/agentSessionsWelcome.ts diff --git a/src/vs/workbench/contrib/welcomeAgentSessions/browser/agentSessionsWelcome.ts b/src/vs/workbench/contrib/welcomeAgentSessions/browser/agentSessionsWelcome.ts
index 34b8408..f8a72d9 100644 index 70191ee..42cf995 100644
--- a/src/vs/workbench/contrib/welcomeAgentSessions/browser/agentSessionsWelcome.ts --- a/src/vs/workbench/contrib/welcomeAgentSessions/browser/agentSessionsWelcome.ts
+++ b/src/vs/workbench/contrib/welcomeAgentSessions/browser/agentSessionsWelcome.ts +++ b/src/vs/workbench/contrib/welcomeAgentSessions/browser/agentSessionsWelcome.ts
@@ -49,3 +49,2 @@ import { AgentSessionsControl, IAgentSessionsControlOptions } from '../../chat/b @@ -49,3 +49,2 @@ import { AgentSessionsControl, IAgentSessionsControlOptions } from '../../chat/b
@@ -3776,12 +3794,12 @@ index 34b8408..f8a72d9 100644
import { ILogService } from '../../../../platform/log/common/log.js'; import { ILogService } from '../../../../platform/log/common/log.js';
+import { FONT } from '../../../../base/common/font.js'; +import { FONT } from '../../../../base/common/font.js';
@@ -825,3 +825,3 @@ export class AgentSessionsWelcomePage extends EditorPane { @@ -826,3 +826,3 @@ export class AgentSessionsWelcomePage extends EditorPane {
); );
- const sessionsHeight = visibleSessions * AgentSessionsListDelegate.ITEM_HEIGHT; - const sessionsHeight = visibleSessions * AgentSessionsListDelegate.ITEM_HEIGHT;
+ const sessionsHeight = visibleSessions * FONT.sidebarSize22; + const sessionsHeight = visibleSessions * FONT.sidebarSize22;
this.sessionsControl.layout(sessionsHeight, sessionsWidth); this.sessionsControl.layout(sessionsHeight, sessionsWidth);
@@ -830,3 +830,3 @@ export class AgentSessionsWelcomePage extends EditorPane { @@ -831,3 +831,3 @@ export class AgentSessionsWelcomePage extends EditorPane {
// Visual height = ceil(n/2) * ITEM_HEIGHT, so offset = floor(n/2) * ITEM_HEIGHT // Visual height = ceil(n/2) * ITEM_HEIGHT, so offset = floor(n/2) * ITEM_HEIGHT
- const marginOffset = Math.floor(visibleSessions / 2) * AgentSessionsListDelegate.ITEM_HEIGHT; - const marginOffset = Math.floor(visibleSessions / 2) * AgentSessionsListDelegate.ITEM_HEIGHT;
+ const marginOffset = Math.floor(visibleSessions / 2) * FONT.sidebarSize22; + const marginOffset = Math.floor(visibleSessions / 2) * FONT.sidebarSize22;

24
patches/fix-keymap.patch
View File

@@ -1,5 +1,5 @@
diff --git a/.npmrc b/.npmrc diff --git a/.npmrc b/.npmrc
index e2305b4..b7863f9 100644 index 2c7c6c1..5d5fc7d 100644
--- a/.npmrc --- a/.npmrc
+++ b/.npmrc +++ b/.npmrc
@@ -6,2 +6,3 @@ ignore-scripts=false @@ -6,2 +6,3 @@ ignore-scripts=false
@@ -24,7 +24,7 @@ index ed36151..5b040cc 100644
+!@vscodium/native-keymap/build/Release/*.node +!@vscodium/native-keymap/build/Release/*.node
diff --git a/eslint.config.js b/eslint.config.js diff --git a/eslint.config.js b/eslint.config.js
index c2b3e29..2a8250b 100644 index 29ffd56..1847a81 100644
--- a/eslint.config.js --- a/eslint.config.js
+++ b/eslint.config.js +++ b/eslint.config.js
@@ -1451,3 +1451,3 @@ export default tseslint.config( @@ -1451,3 +1451,3 @@ export default tseslint.config(
@@ -33,18 +33,18 @@ index c2b3e29..2a8250b 100644
+ '@vscodium/native-keymap', + '@vscodium/native-keymap',
'net', 'net',
diff --git a/package-lock.json b/package-lock.json diff --git a/package-lock.json b/package-lock.json
index c44531c..cc77547 100644 index bb626ac..b3e1b81 100644
--- a/package-lock.json --- a/package-lock.json
+++ b/package-lock.json +++ b/package-lock.json
@@ -32,2 +32,3 @@ @@ -32,2 +32,3 @@
"@vscode/windows-registry": "^1.1.0", "@vscode/windows-registry": "^1.2.0",
+ "@vscodium/native-keymap": "3.3.7-258424", + "@vscodium/native-keymap": "3.3.7-258424",
"@xterm/addon-clipboard": "^0.3.0-beta.152", "@xterm/addon-clipboard": "^0.3.0-beta.167",
@@ -49,3 +50,2 @@ @@ -49,3 +50,2 @@
"native-is-elevated": "0.9.0", "native-is-elevated": "0.9.0",
- "native-keymap": "^3.3.5", - "native-keymap": "^3.3.5",
"node-pty": "^1.2.0-beta.10", "node-pty": "^1.2.0-beta.10",
@@ -3674,2 +3674,9 @@ @@ -3828,2 +3828,9 @@
}, },
+ "node_modules/@vscodium/native-keymap": { + "node_modules/@vscodium/native-keymap": {
+ "version": "3.3.7-258424", + "version": "3.3.7-258424",
@@ -54,7 +54,7 @@ index c44531c..cc77547 100644
+ "license": "MIT" + "license": "MIT"
+ }, + },
"node_modules/@webassemblyjs/ast": { "node_modules/@webassemblyjs/ast": {
@@ -12731,5 +12738,6 @@ @@ -13281,5 +13288,6 @@
"node_modules/napi-build-utils": { "node_modules/napi-build-utils": {
- "version": "1.0.2", - "version": "1.0.2",
- "resolved": "https://registry.npmjs.org/napi-build-utils/-/napi-build-utils-1.0.2.tgz", - "resolved": "https://registry.npmjs.org/napi-build-utils/-/napi-build-utils-1.0.2.tgz",
@@ -64,7 +64,7 @@ index c44531c..cc77547 100644
+ "integrity": "sha512-GEbrYkbfF7MoNaoh2iGG84Mnf/WZfB0GdGEsM8wz7Expx/LlWf5U8t9nvJKXSp3qr5IsEbK04cBGhol/KwOsWA==", + "integrity": "sha512-GEbrYkbfF7MoNaoh2iGG84Mnf/WZfB0GdGEsM8wz7Expx/LlWf5U8t9nvJKXSp3qr5IsEbK04cBGhol/KwOsWA==",
+ "license": "MIT" + "license": "MIT"
}, },
@@ -12742,9 +12750,2 @@ @@ -13292,9 +13300,2 @@
}, },
- "node_modules/native-keymap": { - "node_modules/native-keymap": {
- "version": "3.3.9", - "version": "3.3.9",
@@ -74,7 +74,7 @@ index c44531c..cc77547 100644
- "license": "MIT" - "license": "MIT"
- }, - },
"node_modules/natural-compare": { "node_modules/natural-compare": {
@@ -14132,5 +14133,6 @@ @@ -14717,5 +14718,6 @@
"node_modules/prebuild-install": { "node_modules/prebuild-install": {
- "version": "7.1.2", - "version": "7.1.2",
- "resolved": "https://registry.npmjs.org/prebuild-install/-/prebuild-install-7.1.2.tgz", - "resolved": "https://registry.npmjs.org/prebuild-install/-/prebuild-install-7.1.2.tgz",
@@ -84,16 +84,16 @@ index c44531c..cc77547 100644
+ "integrity": "sha512-8Mf2cbV7x1cXPUILADGI3wuhfqWvtiLA1iclTDbFRZkgRQS0NqsPZphna9V+HyTEadheuPmjaJMsbzKQFOzLug==", + "integrity": "sha512-8Mf2cbV7x1cXPUILADGI3wuhfqWvtiLA1iclTDbFRZkgRQS0NqsPZphna9V+HyTEadheuPmjaJMsbzKQFOzLug==",
+ "license": "MIT", + "license": "MIT",
"dependencies": { "dependencies": {
@@ -14141,3 +14143,3 @@ @@ -14726,3 +14728,3 @@
"mkdirp-classic": "^0.5.3", "mkdirp-classic": "^0.5.3",
- "napi-build-utils": "^1.0.1", - "napi-build-utils": "^1.0.1",
+ "napi-build-utils": "^2.0.0", + "napi-build-utils": "^2.0.0",
"node-abi": "^3.3.0", "node-abi": "^3.3.0",
diff --git a/package.json b/package.json diff --git a/package.json b/package.json
index c5522f4..dcd9913 100644 index 67e53ae..4e4e77c 100644
--- a/package.json --- a/package.json
+++ b/package.json +++ b/package.json
@@ -114,3 +114,3 @@ @@ -118,3 +118,3 @@
"native-is-elevated": "0.9.0", "native-is-elevated": "0.9.0",
- "native-keymap": "^3.3.5", - "native-keymap": "^3.3.5",
+ "@vscodium/native-keymap": "3.3.7-258424", + "@vscodium/native-keymap": "3.3.7-258424",

14
patches/fix-policies.patch
View File

@@ -22,7 +22,7 @@ index 5b040cc..8d5fd71 100644
+!@vscodium/policy-watcher/build/Release/vscodium-policy-watcher.node +!@vscodium/policy-watcher/build/Release/vscodium-policy-watcher.node
diff --git a/eslint.config.js b/eslint.config.js diff --git a/eslint.config.js b/eslint.config.js
index 2a8250b..1df17ec 100644 index 1847a81..3fb3b01 100644
--- a/eslint.config.js --- a/eslint.config.js
+++ b/eslint.config.js +++ b/eslint.config.js
@@ -1434,3 +1434,3 @@ export default tseslint.config( @@ -1434,3 +1434,3 @@ export default tseslint.config(
@@ -31,7 +31,7 @@ index 2a8250b..1df17ec 100644
+ '@vscodium/policy-watcher', + '@vscodium/policy-watcher',
'@vscode/proxy-agent', '@vscode/proxy-agent',
diff --git a/package-lock.json b/package-lock.json diff --git a/package-lock.json b/package-lock.json
index cc77547..622093b 100644 index b3e1b81..7c34f88 100644
--- a/package-lock.json --- a/package-lock.json
+++ b/package-lock.json +++ b/package-lock.json
@@ -21,3 +21,2 @@ @@ -21,3 +21,2 @@
@@ -41,8 +41,8 @@ index cc77547..622093b 100644
@@ -33,2 +32,3 @@ @@ -33,2 +32,3 @@
"@vscodium/native-keymap": "3.3.7-258424", "@vscodium/native-keymap": "3.3.7-258424",
+ "@vscodium/policy-watcher": "^1.3.2-252465", + "@vscodium/policy-watcher": "^1.3.2-252465",
"@xterm/addon-clipboard": "^0.3.0-beta.152", "@xterm/addon-clipboard": "^0.3.0-beta.167",
@@ -3345,22 +3345,2 @@ @@ -3498,22 +3498,2 @@
}, },
- "node_modules/@vscode/policy-watcher": { - "node_modules/@vscode/policy-watcher": {
- "version": "1.3.7", - "version": "1.3.7",
@@ -65,7 +65,7 @@ index cc77547..622093b 100644
- } - }
- }, - },
"node_modules/@vscode/proxy-agent": { "node_modules/@vscode/proxy-agent": {
@@ -3681,2 +3661,22 @@ @@ -3835,2 +3815,22 @@
}, },
+ "node_modules/@vscodium/policy-watcher": { + "node_modules/@vscodium/policy-watcher": {
+ "version": "1.3.2-252465", + "version": "1.3.2-252465",
@@ -89,10 +89,10 @@ index cc77547..622093b 100644
+ }, + },
"node_modules/@webassemblyjs/ast": { "node_modules/@webassemblyjs/ast": {
diff --git a/package.json b/package.json diff --git a/package.json b/package.json
index dcd9913..8becea3 100644 index 4e4e77c..665303a 100644
--- a/package.json --- a/package.json
+++ b/package.json +++ b/package.json
@@ -86,3 +86,3 @@ @@ -90,3 +90,3 @@
"@vscode/native-watchdog": "^1.4.6", "@vscode/native-watchdog": "^1.4.6",
- "@vscode/policy-watcher": "^1.3.2", - "@vscode/policy-watcher": "^1.3.2",
+ "@vscodium/policy-watcher": "^1.3.2-252465", + "@vscodium/policy-watcher": "^1.3.2-252465",

17
patches/helper/settings.patch
View File

@@ -1,8 +1,8 @@
diff --git a/.vscode/settings.json b/.vscode/settings.json diff --git a/.vscode/settings.json b/.vscode/settings.json
index 3e903f6..fb3b3a8 100644 index 7434345..f870f59 100644
--- a/.vscode/settings.json --- a/.vscode/settings.json
+++ b/.vscode/settings.json +++ b/.vscode/settings.json
@@ -26,6 +26,6 @@ @@ -29,6 +29,6 @@
"[typescript]": { "[typescript]": {
- "editor.formatOnSave": true - "editor.formatOnSave": true
+ // "editor.formatOnSave": true + // "editor.formatOnSave": true
@@ -11,24 +11,15 @@ index 3e903f6..fb3b3a8 100644
- "editor.formatOnSave": true - "editor.formatOnSave": true
+ // "editor.formatOnSave": true + // "editor.formatOnSave": true
}, },
@@ -33,3 +33,3 @@ @@ -36,3 +36,3 @@
"editor.defaultFormatter": "rust-lang.rust-analyzer", "editor.defaultFormatter": "rust-lang.rust-analyzer",
- "editor.formatOnSave": true, - "editor.formatOnSave": true,
+ // "editor.formatOnSave": true, + // "editor.formatOnSave": true,
}, },
@@ -39,4 +39,4 @@ @@ -42,4 +42,4 @@
// --- Files --- // --- Files ---
- "files.trimTrailingWhitespace": true, - "files.trimTrailingWhitespace": true,
- "files.insertFinalNewline": true, - "files.insertFinalNewline": true,
+ // "files.trimTrailingWhitespace": true, + // "files.trimTrailingWhitespace": true,
+ // "files.insertFinalNewline": true, + // "files.insertFinalNewline": true,
"files.exclude": { "files.exclude": {
@@ -49,5 +49,5 @@
"build/**/*.js.map": true,
- "build/**/*.js": {
- "when": "$(basename).ts"
- }
+ // "build/**/*.js": {
+ // "when": "$(basename).ts"
+ // }
},

18
patches/linux/arch-0-support.patch
View File

@@ -13,10 +13,10 @@ index f0d5fe6..fdb3707 100755
+ SYSROOT_ARCH="$SYSROOT_ARCH" VSCODE_SYSROOT_DIR="$VSCODE_REMOTE_SYSROOT_DIR" node -e 'import { getVSCodeSysroot } from "./build/linux/debian/install-sysroot.ts"; (async () => { await getVSCodeSysroot(process.env["SYSROOT_ARCH"]); })()' + SYSROOT_ARCH="$SYSROOT_ARCH" VSCODE_SYSROOT_DIR="$VSCODE_REMOTE_SYSROOT_DIR" node -e 'import { getVSCodeSysroot } from "./build/linux/debian/install-sysroot.ts"; (async () => { await getVSCodeSysroot(process.env["SYSROOT_ARCH"]); })()'
fi fi
diff --git a/build/gulpfile.reh.ts b/build/gulpfile.reh.ts diff --git a/build/gulpfile.reh.ts b/build/gulpfile.reh.ts
index b935764..012df0b 100644 index 8e7f6bb..0874203 100644
--- a/build/gulpfile.reh.ts --- a/build/gulpfile.reh.ts
+++ b/build/gulpfile.reh.ts +++ b/build/gulpfile.reh.ts
@@ -235,9 +235,23 @@ function nodejs(platform: string, arch: string): NodeJS.ReadWriteStream | undefi @@ -239,9 +239,23 @@ function nodejs(platform: string, arch: string): NodeJS.ReadWriteStream | undefi
case 'linux': case 'linux':
- return (product.nodejsRepository !== 'https://nodejs.org' ? - return (product.nodejsRepository !== 'https://nodejs.org' ?
- fetchGithub(product.nodejsRepository, { version: `${nodeVersion}-${internalNodeVersion}`, name: expectedName!, checksumSha256 }) : - fetchGithub(product.nodejsRepository, { version: `${nodeVersion}-${internalNodeVersion}`, name: expectedName!, checksumSha256 }) :
@@ -48,10 +48,10 @@ index b935764..012df0b 100644
+ } + }
case 'alpine': case 'alpine':
diff --git a/build/gulpfile.vscode.ts b/build/gulpfile.vscode.ts diff --git a/build/gulpfile.vscode.ts b/build/gulpfile.vscode.ts
index a103f11..ce46a41 100644 index 25a3600..c9402f3 100644
--- a/build/gulpfile.vscode.ts --- a/build/gulpfile.vscode.ts
+++ b/build/gulpfile.vscode.ts +++ b/build/gulpfile.vscode.ts
@@ -472,2 +472,12 @@ function packageTask(platform: string, arch: string, sourceFolderName: string, d @@ -516,4 +516,15 @@ function packageTask(platform: string, arch: string, sourceFolderName: string, d
+ const electronOverride: { repo?: string; tag?: string } = {}; + const electronOverride: { repo?: string; tag?: string } = {};
+ if (process.env.VSCODE_ELECTRON_REPOSITORY) { + if (process.env.VSCODE_ELECTRON_REPOSITORY) {
@@ -63,12 +63,10 @@ index a103f11..ce46a41 100644
+ electronOverride.tag = process.env.VSCODE_ELECTRON_TAG; + electronOverride.tag = process.env.VSCODE_ELECTRON_TAG;
+ } + }
+ +
let result: NodeJS.ReadWriteStream = all const electronConfig = {
@@ -476,3 +486,3 @@ function packageTask(platform: string, arch: string, sourceFolderName: string, d ...config,
.pipe(filter(['**', '!**/.github/**'], { dot: true })) // https://github.com/microsoft/vscode/issues/116523 + ...electronOverride,
- .pipe(electron({ ...config, platform, arch: arch === 'armhf' ? 'arm' : arch, ffmpegChromium: false })) platform,
+ .pipe(electron({ ...config, ...electronOverride, platform, arch: arch === 'armhf' ? 'arm' : arch, ffmpegChromium: false }))
.pipe(filter(['**', '!LICENSE', '!version', ...(platform === 'darwin' ? ['!**/Contents/Applications/**'] : [])], { dot: true }));
diff --git a/build/linux/debian/dep-lists.ts b/build/linux/debian/dep-lists.ts diff --git a/build/linux/debian/dep-lists.ts b/build/linux/debian/dep-lists.ts
index 46c257d..78bfb66 100644 index 46c257d..78bfb66 100644
--- a/build/linux/debian/dep-lists.ts --- a/build/linux/debian/dep-lists.ts

451
patches/linux/fix-build.patch
View File

@@ -18,14 +18,14 @@ index 874c802..04731cf 100644
+ // files.push(path.join(buildDir, 'bin', product.tunnelApplicationName)); + // files.push(path.join(buildDir, 'bin', product.tunnelApplicationName));
// Add the main executable. // Add the main executable.
diff --git a/build/package-lock.json b/build/package-lock.json diff --git a/build/package-lock.json b/build/package-lock.json
index 1a544ba..78337cd 100644 index b78c4c8..58ee897 100644
--- a/build/package-lock.json --- a/build/package-lock.json
+++ b/build/package-lock.json +++ b/build/package-lock.json
@@ -17,3 +17,2 @@ @@ -17,3 +17,2 @@
"@electron/get": "^2.0.0", "@electron/get": "^2.0.0",
- "@electron/osx-sign": "^2.0.0", - "@electron/osx-sign": "^2.0.0",
"@types/ansi-colors": "^3.2.0", "@types/ansi-colors": "^3.2.0",
@@ -107,5 +106,5 @@ @@ -106,5 +105,5 @@
"node_modules/@azure/core-auth": { "node_modules/@azure/core-auth": {
- "version": "1.9.0", - "version": "1.9.0",
- "resolved": "https://registry.npmjs.org/@azure/core-auth/-/core-auth-1.9.0.tgz", - "resolved": "https://registry.npmjs.org/@azure/core-auth/-/core-auth-1.9.0.tgz",
@@ -34,19 +34,19 @@ index 1a544ba..78337cd 100644
+ "resolved": "https://registry.npmjs.org/@azure/core-auth/-/core-auth-1.10.1.tgz", + "resolved": "https://registry.npmjs.org/@azure/core-auth/-/core-auth-1.10.1.tgz",
+ "integrity": "sha512-ykRMW8PjVAn+RS6ww5cmK9U2CyH9p4Q88YJwvUslfuMmN98w/2rdGRLPqJYObapBCdzBVeDgYWdJnFPFb7qzpg==", + "integrity": "sha512-ykRMW8PjVAn+RS6ww5cmK9U2CyH9p4Q88YJwvUslfuMmN98w/2rdGRLPqJYObapBCdzBVeDgYWdJnFPFb7qzpg==",
"dev": true, "dev": true,
@@ -113,4 +112,4 @@ @@ -112,4 +111,4 @@
"dependencies": { "dependencies": {
- "@azure/abort-controller": "^2.0.0", - "@azure/abort-controller": "^2.0.0",
- "@azure/core-util": "^1.11.0", - "@azure/core-util": "^1.11.0",
+ "@azure/abort-controller": "^2.1.2", + "@azure/abort-controller": "^2.1.2",
+ "@azure/core-util": "^1.13.0", + "@azure/core-util": "^1.13.0",
"tslib": "^2.6.2" "tslib": "^2.6.2"
@@ -118,3 +117,3 @@ @@ -117,3 +116,3 @@
"engines": { "engines": {
- "node": ">=18.0.0" - "node": ">=18.0.0"
+ "node": ">=20.0.0" + "node": ">=20.0.0"
} }
@@ -237,5 +236,5 @@ @@ -236,5 +235,5 @@
"node_modules/@azure/core-rest-pipeline": { "node_modules/@azure/core-rest-pipeline": {
- "version": "1.18.0", - "version": "1.18.0",
- "resolved": "https://registry.npmjs.org/@azure/core-rest-pipeline/-/core-rest-pipeline-1.18.0.tgz", - "resolved": "https://registry.npmjs.org/@azure/core-rest-pipeline/-/core-rest-pipeline-1.18.0.tgz",
@@ -55,7 +55,7 @@ index 1a544ba..78337cd 100644
+ "resolved": "https://registry.npmjs.org/@azure/core-rest-pipeline/-/core-rest-pipeline-1.22.2.tgz", + "resolved": "https://registry.npmjs.org/@azure/core-rest-pipeline/-/core-rest-pipeline-1.22.2.tgz",
+ "integrity": "sha512-MzHym+wOi8CLUlKCQu12de0nwcq9k9Kuv43j4Wa++CsCpJwps2eeBQwD2Bu8snkxTtDKDx4GwjuR9E8yC8LNrg==", + "integrity": "sha512-MzHym+wOi8CLUlKCQu12de0nwcq9k9Kuv43j4Wa++CsCpJwps2eeBQwD2Bu8snkxTtDKDx4GwjuR9E8yC8LNrg==",
"dev": true, "dev": true,
@@ -243,9 +242,8 @@ @@ -242,9 +241,8 @@
"dependencies": { "dependencies": {
- "@azure/abort-controller": "^2.0.0", - "@azure/abort-controller": "^2.0.0",
- "@azure/core-auth": "^1.8.0", - "@azure/core-auth": "^1.8.0",
@@ -71,12 +71,12 @@ index 1a544ba..78337cd 100644
+ "@azure/logger": "^1.3.0", + "@azure/logger": "^1.3.0",
+ "@typespec/ts-http-runtime": "^0.3.0", + "@typespec/ts-http-runtime": "^0.3.0",
"tslib": "^2.6.2" "tslib": "^2.6.2"
@@ -253,3 +251,3 @@ @@ -252,3 +250,3 @@
"engines": { "engines": {
- "node": ">=18.0.0" - "node": ">=18.0.0"
+ "node": ">=20.0.0" + "node": ">=20.0.0"
} }
@@ -270,5 +268,5 @@ @@ -269,5 +267,5 @@
"node_modules/@azure/core-tracing": { "node_modules/@azure/core-tracing": {
- "version": "1.2.0", - "version": "1.2.0",
- "resolved": "https://registry.npmjs.org/@azure/core-tracing/-/core-tracing-1.2.0.tgz", - "resolved": "https://registry.npmjs.org/@azure/core-tracing/-/core-tracing-1.2.0.tgz",
@@ -85,12 +85,12 @@ index 1a544ba..78337cd 100644
+ "resolved": "https://registry.npmjs.org/@azure/core-tracing/-/core-tracing-1.3.1.tgz", + "resolved": "https://registry.npmjs.org/@azure/core-tracing/-/core-tracing-1.3.1.tgz",
+ "integrity": "sha512-9MWKevR7Hz8kNzzPLfX4EAtGM2b8mr50HPDBvio96bURP/9C+HjdH3sBlLSNNrvRAr5/k/svoH457gB5IKpmwQ==", + "integrity": "sha512-9MWKevR7Hz8kNzzPLfX4EAtGM2b8mr50HPDBvio96bURP/9C+HjdH3sBlLSNNrvRAr5/k/svoH457gB5IKpmwQ==",
"dev": true, "dev": true,
@@ -279,3 +277,3 @@ @@ -278,3 +276,3 @@
"engines": { "engines": {
- "node": ">=18.0.0" - "node": ">=18.0.0"
+ "node": ">=20.0.0" + "node": ">=20.0.0"
} }
@@ -283,5 +281,5 @@ @@ -282,5 +280,5 @@
"node_modules/@azure/core-util": { "node_modules/@azure/core-util": {
- "version": "1.11.0", - "version": "1.11.0",
- "resolved": "https://registry.npmjs.org/@azure/core-util/-/core-util-1.11.0.tgz", - "resolved": "https://registry.npmjs.org/@azure/core-util/-/core-util-1.11.0.tgz",
@@ -99,18 +99,18 @@ index 1a544ba..78337cd 100644
+ "resolved": "https://registry.npmjs.org/@azure/core-util/-/core-util-1.13.1.tgz", + "resolved": "https://registry.npmjs.org/@azure/core-util/-/core-util-1.13.1.tgz",
+ "integrity": "sha512-XPArKLzsvl0Hf0CaGyKHUyVgF7oDnhKoP85Xv6M4StF/1AhfORhZudHtOyf2s+FcbuQ9dPRAjB8J2KvRRMUK2A==", + "integrity": "sha512-XPArKLzsvl0Hf0CaGyKHUyVgF7oDnhKoP85Xv6M4StF/1AhfORhZudHtOyf2s+FcbuQ9dPRAjB8J2KvRRMUK2A==",
"dev": true, "dev": true,
@@ -289,3 +287,4 @@ @@ -288,3 +286,4 @@
"dependencies": { "dependencies": {
- "@azure/abort-controller": "^2.0.0", - "@azure/abort-controller": "^2.0.0",
+ "@azure/abort-controller": "^2.1.2", + "@azure/abort-controller": "^2.1.2",
+ "@typespec/ts-http-runtime": "^0.3.0", + "@typespec/ts-http-runtime": "^0.3.0",
"tslib": "^2.6.2" "tslib": "^2.6.2"
@@ -293,3 +292,3 @@ @@ -292,3 +291,3 @@
"engines": { "engines": {
- "node": ">=18.0.0" - "node": ">=18.0.0"
+ "node": ">=20.0.0" + "node": ">=20.0.0"
} }
@@ -372,11 +371,13 @@ @@ -371,11 +370,13 @@
"node_modules/@azure/logger": { "node_modules/@azure/logger": {
- "version": "1.0.1", - "version": "1.0.1",
- "resolved": "https://registry.npmjs.org/@azure/logger/-/logger-1.0.1.tgz", - "resolved": "https://registry.npmjs.org/@azure/logger/-/logger-1.0.1.tgz",
@@ -129,7 +129,7 @@ index 1a544ba..78337cd 100644
- "node": ">=8.0.0" - "node": ">=8.0.0"
+ "node": ">=20.0.0" + "node": ">=20.0.0"
} }
@@ -483,5 +484,5 @@ @@ -482,5 +483,5 @@
"node_modules/@babel/helper-validator-identifier": { "node_modules/@babel/helper-validator-identifier": {
- "version": "7.27.1", - "version": "7.27.1",
- "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.27.1.tgz", - "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.27.1.tgz",
@@ -138,7 +138,7 @@ index 1a544ba..78337cd 100644
+ "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.28.5.tgz", + "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.28.5.tgz",
+ "integrity": "sha512-qSs4ifwzKJSV39ucNjsvc6WVHs6b7S03sOh2OcHF9UHfVPqWWALUsNUVzhSBiItjRZoLHx7nIarVjqKVusUZ1Q==", + "integrity": "sha512-qSs4ifwzKJSV39ucNjsvc6WVHs6b7S03sOh2OcHF9UHfVPqWWALUsNUVzhSBiItjRZoLHx7nIarVjqKVusUZ1Q==",
"dev": true, "dev": true,
@@ -766,50 +767,2 @@ @@ -539,50 +540,2 @@
}, },
- "node_modules/@electron/osx-sign": { - "node_modules/@electron/osx-sign": {
- "version": "2.0.0", - "version": "2.0.0",
@@ -188,8 +188,8 @@ index 1a544ba..78337cd 100644
- "node": ">=10" - "node": ">=10"
- } - }
- }, - },
"node_modules/@electron/rebuild": { "node_modules/@esbuild/aix-ppc64": {
@@ -2029,5 +1982,5 @@ @@ -1367,5 +1320,5 @@
"node_modules/@textlint/ast-node-types": { "node_modules/@textlint/ast-node-types": {
- "version": "15.2.2", - "version": "15.2.2",
- "resolved": "https://registry.npmjs.org/@textlint/ast-node-types/-/ast-node-types-15.2.2.tgz", - "resolved": "https://registry.npmjs.org/@textlint/ast-node-types/-/ast-node-types-15.2.2.tgz",
@@ -198,7 +198,7 @@ index 1a544ba..78337cd 100644
+ "resolved": "https://registry.npmjs.org/@textlint/ast-node-types/-/ast-node-types-15.4.1.tgz", + "resolved": "https://registry.npmjs.org/@textlint/ast-node-types/-/ast-node-types-15.4.1.tgz",
+ "integrity": "sha512-XifMpBMdo0E1Fuh85YdcYAgy+okNg9WKBzIPIO4JUDnSWUVFihnogrM4cjDapeHkgzSgulwR8oJVJ17eyxI1bA==", + "integrity": "sha512-XifMpBMdo0E1Fuh85YdcYAgy+okNg9WKBzIPIO4JUDnSWUVFihnogrM4cjDapeHkgzSgulwR8oJVJ17eyxI1bA==",
"dev": true, "dev": true,
@@ -2036,5 +1989,5 @@ @@ -1374,5 +1327,5 @@
"node_modules/@textlint/linter-formatter": { "node_modules/@textlint/linter-formatter": {
- "version": "15.2.2", - "version": "15.2.2",
- "resolved": "https://registry.npmjs.org/@textlint/linter-formatter/-/linter-formatter-15.2.2.tgz", - "resolved": "https://registry.npmjs.org/@textlint/linter-formatter/-/linter-formatter-15.2.2.tgz",
@@ -207,7 +207,7 @@ index 1a544ba..78337cd 100644
+ "resolved": "https://registry.npmjs.org/@textlint/linter-formatter/-/linter-formatter-15.4.1.tgz", + "resolved": "https://registry.npmjs.org/@textlint/linter-formatter/-/linter-formatter-15.4.1.tgz",
+ "integrity": "sha512-kAV7Sup3vwvqxKvBbf9lx/JaPHkRybQp/LLvA73U1AorPZE6XyfBAFG24BbMiCs4OX1ax4g7kXRuFPgMLWRf+g==", + "integrity": "sha512-kAV7Sup3vwvqxKvBbf9lx/JaPHkRybQp/LLvA73U1AorPZE6XyfBAFG24BbMiCs4OX1ax4g7kXRuFPgMLWRf+g==",
"dev": true, "dev": true,
@@ -2044,8 +1997,8 @@ @@ -1382,8 +1335,8 @@
"@azu/style-format": "^1.0.1", "@azu/style-format": "^1.0.1",
- "@textlint/module-interop": "15.2.2", - "@textlint/module-interop": "15.2.2",
- "@textlint/resolver": "15.2.2", - "@textlint/resolver": "15.2.2",
@@ -221,7 +221,7 @@ index 1a544ba..78337cd 100644
+ "debug": "^4.4.3", + "debug": "^4.4.3",
+ "js-yaml": "^4.1.0", + "js-yaml": "^4.1.0",
"lodash": "^4.17.21", "lodash": "^4.17.21",
@@ -2121,2 +2074,9 @@ @@ -1459,2 +1412,9 @@
}, },
+ "node_modules/@textlint/linter-formatter/node_modules/emoji-regex": { + "node_modules/@textlint/linter-formatter/node_modules/emoji-regex": {
+ "version": "8.0.0", + "version": "8.0.0",
@@ -231,7 +231,7 @@ index 1a544ba..78337cd 100644
+ "license": "MIT" + "license": "MIT"
+ }, + },
"node_modules/@textlint/linter-formatter/node_modules/has-flag": { "node_modules/@textlint/linter-formatter/node_modules/has-flag": {
@@ -2138,2 +2098,17 @@ @@ -1476,2 +1436,17 @@
}, },
+ "node_modules/@textlint/linter-formatter/node_modules/string-width": { + "node_modules/@textlint/linter-formatter/node_modules/string-width": {
+ "version": "4.2.3", + "version": "4.2.3",
@@ -249,7 +249,7 @@ index 1a544ba..78337cd 100644
+ } + }
+ }, + },
"node_modules/@textlint/linter-formatter/node_modules/strip-ansi": { "node_modules/@textlint/linter-formatter/node_modules/strip-ansi": {
@@ -2165,5 +2140,5 @@ @@ -1503,5 +1478,5 @@
"node_modules/@textlint/module-interop": { "node_modules/@textlint/module-interop": {
- "version": "15.2.2", - "version": "15.2.2",
- "resolved": "https://registry.npmjs.org/@textlint/module-interop/-/module-interop-15.2.2.tgz", - "resolved": "https://registry.npmjs.org/@textlint/module-interop/-/module-interop-15.2.2.tgz",
@@ -258,7 +258,7 @@ index 1a544ba..78337cd 100644
+ "resolved": "https://registry.npmjs.org/@textlint/module-interop/-/module-interop-15.4.1.tgz", + "resolved": "https://registry.npmjs.org/@textlint/module-interop/-/module-interop-15.4.1.tgz",
+ "integrity": "sha512-jHtM2E5CR68P3z/+FGrEU5pml2fQVzEo2sez9FEjrVHSPCrHtqHcPaKfsYbQJjc9C48ObwaWrCzRNaL3KedNCQ==", + "integrity": "sha512-jHtM2E5CR68P3z/+FGrEU5pml2fQVzEo2sez9FEjrVHSPCrHtqHcPaKfsYbQJjc9C48ObwaWrCzRNaL3KedNCQ==",
"dev": true, "dev": true,
@@ -2172,5 +2147,5 @@ @@ -1510,5 +1485,5 @@
"node_modules/@textlint/resolver": { "node_modules/@textlint/resolver": {
- "version": "15.2.2", - "version": "15.2.2",
- "resolved": "https://registry.npmjs.org/@textlint/resolver/-/resolver-15.2.2.tgz", - "resolved": "https://registry.npmjs.org/@textlint/resolver/-/resolver-15.2.2.tgz",
@@ -267,7 +267,7 @@ index 1a544ba..78337cd 100644
+ "resolved": "https://registry.npmjs.org/@textlint/resolver/-/resolver-15.4.1.tgz", + "resolved": "https://registry.npmjs.org/@textlint/resolver/-/resolver-15.4.1.tgz",
+ "integrity": "sha512-uVssyG3XXXKNY+O7NOajGvQZTyOuhPviwlq7Xek6ZT9K1eDQtA8074cPkAQoLMYhi/TUyOE5P5kpz42UF8Lmdw==", + "integrity": "sha512-uVssyG3XXXKNY+O7NOajGvQZTyOuhPviwlq7Xek6ZT9K1eDQtA8074cPkAQoLMYhi/TUyOE5P5kpz42UF8Lmdw==",
"dev": true, "dev": true,
@@ -2179,5 +2154,5 @@ @@ -1517,5 +1492,5 @@
"node_modules/@textlint/types": { "node_modules/@textlint/types": {
- "version": "15.2.2", - "version": "15.2.2",
- "resolved": "https://registry.npmjs.org/@textlint/types/-/types-15.2.2.tgz", - "resolved": "https://registry.npmjs.org/@textlint/types/-/types-15.2.2.tgz",
@@ -276,12 +276,12 @@ index 1a544ba..78337cd 100644
+ "resolved": "https://registry.npmjs.org/@textlint/types/-/types-15.4.1.tgz", + "resolved": "https://registry.npmjs.org/@textlint/types/-/types-15.4.1.tgz",
+ "integrity": "sha512-WByVZ3zblbvuI+voWQplUP7seSTKXI9z6TMVXEB3dY3JFrZCIXWKNfLbETX5lZV7fYkCMaDtILO1l6s11wdbQA==", + "integrity": "sha512-WByVZ3zblbvuI+voWQplUP7seSTKXI9z6TMVXEB3dY3JFrZCIXWKNfLbETX5lZV7fYkCMaDtILO1l6s11wdbQA==",
"dev": true, "dev": true,
@@ -2185,3 +2160,3 @@ @@ -1523,3 +1498,3 @@
"dependencies": { "dependencies": {
- "@textlint/ast-node-types": "15.2.2" - "@textlint/ast-node-types": "15.2.2"
+ "@textlint/ast-node-types": "15.4.1" + "@textlint/ast-node-types": "15.4.1"
} }
@@ -2279,12 +2254,2 @@ @@ -1617,12 +1592,2 @@
}, },
- "node_modules/@types/graceful-fs": { - "node_modules/@types/graceful-fs": {
- "version": "4.1.9", - "version": "4.1.9",
@@ -294,23 +294,7 @@ index 1a544ba..78337cd 100644
- } - }
- }, - },
"node_modules/@types/gulp": { "node_modules/@types/gulp": {
@@ -2429,2 +2394,3 @@ @@ -1944,2 +1909,17 @@
"dev": true,
+ "license": "BSD-2-Clause",
"dependencies": {
@@ -2594,2 +2560,3 @@
"dev": true,
+ "license": "BSD-2-Clause",
"dependencies": {
@@ -2606,2 +2573,3 @@
"dev": true,
+ "license": "MIT",
"dependencies": {
@@ -2621,2 +2589,3 @@
"dev": true,
+ "license": "MIT",
"optional": true,
@@ -2626,2 +2595,17 @@
}, },
+ "node_modules/@typespec/ts-http-runtime": { + "node_modules/@typespec/ts-http-runtime": {
+ "version": "0.3.2", + "version": "0.3.2",
@@ -328,11 +312,11 @@ index 1a544ba..78337cd 100644
+ } + }
+ }, + },
"node_modules/@vscode/iconv-lite-umd": { "node_modules/@vscode/iconv-lite-umd": {
@@ -2952,2 +2936,3 @@ @@ -2270,2 +2250,3 @@
"dev": true, "dev": true,
+ "license": "ISC", + "license": "ISC",
"bin": { "bin": {
@@ -3056,5 +3041,5 @@ @@ -2347,5 +2328,5 @@
"node_modules/ansi-escapes": { "node_modules/ansi-escapes": {
- "version": "7.1.1", - "version": "7.1.1",
- "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-7.1.1.tgz", - "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-7.1.1.tgz",
@@ -341,7 +325,11 @@ index 1a544ba..78337cd 100644
+ "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-7.2.0.tgz", + "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-7.2.0.tgz",
+ "integrity": "sha512-g6LhBsl+GBPRWGWsBtutpzBYuIIdBkLEvad5C/va/74Db018+5TZiyA26cZJAr3Rft5lprVqOIPxf5Vid6tqAw==", + "integrity": "sha512-g6LhBsl+GBPRWGWsBtutpzBYuIIdBkLEvad5C/va/74Db018+5TZiyA26cZJAr3Rft5lprVqOIPxf5Vid6tqAw==",
"dev": true, "dev": true,
@@ -3336,17 +3321,7 @@ @@ -2392,2 +2373,3 @@
"dev": true,
+ "license": "BSD-2-Clause",
"dependencies": {
@@ -2422,17 +2404,7 @@
"node_modules/argparse": { "node_modules/argparse": {
- "version": "1.0.10", - "version": "1.0.10",
- "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz", - "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
@@ -363,31 +351,25 @@ index 1a544ba..78337cd 100644
- "license": "BSD-3-Clause" - "license": "BSD-3-Clause"
+ "license": "Python-2.0" + "license": "Python-2.0"
}, },
@@ -3477,3 +3452,4 @@ @@ -2480,2 +2452,3 @@
}
- ]
+ ],
+ "license": "BSD-2-Clause"
},
@@ -3509,2 +3485,3 @@
"dev": true, "dev": true,
+ "license": "ISC", + "license": "BSD-2-Clause",
"dependencies": { "dependencies": {
@@ -3519,3 +3496,4 @@ @@ -2564,2 +2537,3 @@
"dev": true,
+ "license": "MIT",
"optional": true,
@@ -2575,3 +2549,4 @@
"integrity": "sha512-JZOSA7Mo9sNGB8+UjSgzdLtokWAky1zbztM3WRLCbZ70/3cTANmQmOdR7y2g+J0e2WXywy1yS468tY+IruqEww==", "integrity": "sha512-JZOSA7Mo9sNGB8+UjSgzdLtokWAky1zbztM3WRLCbZ70/3cTANmQmOdR7y2g+J0e2WXywy1yS468tY+IruqEww==",
- "dev": true - "dev": true
+ "dev": true, + "dev": true,
+ "license": "ISC" + "license": "ISC"
}, },
@@ -3526,2 +3504,3 @@ @@ -2677,2 +2652,3 @@
"dev": true,
+ "license": "ISC",
"optional": true
@@ -3782,2 +3761,3 @@
"dev": true, "dev": true,
+ "license": "MIT", + "license": "MIT",
"engines": { "dependencies": {
@@ -3980,6 +3960,7 @@ @@ -2736,6 +2712,7 @@
"node_modules/cheerio": { "node_modules/cheerio": {
- "version": "1.0.0-rc.12", - "version": "1.0.0-rc.12",
- "resolved": "https://registry.npmjs.org/cheerio/-/cheerio-1.0.0-rc.12.tgz", - "resolved": "https://registry.npmjs.org/cheerio/-/cheerio-1.0.0-rc.12.tgz",
@@ -398,7 +380,7 @@ index 1a544ba..78337cd 100644
"dev": true, "dev": true,
+ "license": "MIT", + "license": "MIT",
"dependencies": { "dependencies": {
@@ -3988,9 +3969,13 @@ @@ -2744,9 +2721,13 @@
"domhandler": "^5.0.3", "domhandler": "^5.0.3",
- "domutils": "^3.0.1", - "domutils": "^3.0.1",
- "htmlparser2": "^8.0.1", - "htmlparser2": "^8.0.1",
@@ -417,107 +399,7 @@ index 1a544ba..78337cd 100644
- "node": ">= 6" - "node": ">= 6"
+ "node": ">=20.18.1" + "node": ">=20.18.1"
}, },
@@ -4043,2 +4028,3 @@ @@ -2961,6 +2942,7 @@
"dev": true,
+ "license": "MIT",
"optional": true
@@ -4112,2 +4098,13 @@
},
+ "node_modules/cli-truncate/node_modules/ansi-regex": {
+ "version": "5.0.1",
+ "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
+ "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
+ "dev": true,
+ "license": "MIT",
+ "optional": true,
+ "engines": {
+ "node": ">=8"
+ }
+ },
"node_modules/cli-truncate/node_modules/ansi-styles": {
@@ -4151,2 +4148,10 @@
},
+ "node_modules/cli-truncate/node_modules/emoji-regex": {
+ "version": "8.0.0",
+ "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
+ "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
+ "dev": true,
+ "license": "MIT",
+ "optional": true
+ },
"node_modules/cli-truncate/node_modules/slice-ansi": {
@@ -4167,2 +4172,32 @@
},
+ "node_modules/cli-truncate/node_modules/string-width": {
+ "version": "4.2.3",
+ "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
+ "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
+ "dev": true,
+ "license": "MIT",
+ "optional": true,
+ "dependencies": {
+ "emoji-regex": "^8.0.0",
+ "is-fullwidth-code-point": "^3.0.0",
+ "strip-ansi": "^6.0.1"
+ },
+ "engines": {
+ "node": ">=8"
+ }
+ },
+ "node_modules/cli-truncate/node_modules/strip-ansi": {
+ "version": "6.0.1",
+ "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
+ "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
+ "dev": true,
+ "license": "MIT",
+ "optional": true,
+ "dependencies": {
+ "ansi-regex": "^5.0.1"
+ },
+ "engines": {
+ "node": ">=8"
+ }
+ },
"node_modules/cliui": {
@@ -4228,2 +4263,24 @@
},
+ "node_modules/cliui/node_modules/emoji-regex": {
+ "version": "8.0.0",
+ "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
+ "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
+ "dev": true,
+ "license": "MIT"
+ },
+ "node_modules/cliui/node_modules/string-width": {
+ "version": "4.2.3",
+ "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
+ "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
+ "dev": true,
+ "license": "MIT",
+ "dependencies": {
+ "emoji-regex": "^8.0.0",
+ "is-fullwidth-code-point": "^3.0.0",
+ "strip-ansi": "^6.0.1"
+ },
+ "engines": {
+ "node": ">=8"
+ }
+ },
"node_modules/cliui/node_modules/strip-ansi": {
@@ -4282,2 +4339,3 @@
"dev": true,
+ "license": "BSD-2-Clause",
"dependencies": {
@@ -4372,3 +4430,3 @@
"engines": {
- "node": ">=18"
+ "node": ">=20"
}
@@ -4428,2 +4486,3 @@
"dev": true,
+ "license": "MIT",
"dependencies": {
@@ -4440,6 +4499,7 @@
"node_modules/css-what": { "node_modules/css-what": {
- "version": "6.1.0", - "version": "6.1.0",
- "resolved": "https://registry.npmjs.org/css-what/-/css-what-6.1.0.tgz", - "resolved": "https://registry.npmjs.org/css-what/-/css-what-6.1.0.tgz",
@@ -528,19 +410,13 @@ index 1a544ba..78337cd 100644
"dev": true, "dev": true,
+ "license": "BSD-2-Clause", + "license": "BSD-2-Clause",
"engines": { "engines": {
@@ -4501,2 +4561,3 @@ @@ -3119,3 +3101,4 @@
"dev": true, }
+ "license": "(MIT OR WTFPL)", - ]
"optional": true, + ],
@@ -4552,2 +4613,3 @@ + "license": "BSD-2-Clause"
"dev": true, },
+ "license": "MIT", @@ -3137,6 +3120,7 @@
"optional": true,
@@ -4584,2 +4646,3 @@
"dev": true,
+ "license": "ISC",
"optional": true
@@ -4766,6 +4829,7 @@
"node_modules/domutils": { "node_modules/domutils": {
- "version": "3.0.1", - "version": "3.0.1",
- "resolved": "https://registry.npmjs.org/domutils/-/domutils-3.0.1.tgz", - "resolved": "https://registry.npmjs.org/domutils/-/domutils-3.0.1.tgz",
@@ -551,12 +427,12 @@ index 1a544ba..78337cd 100644
"dev": true, "dev": true,
+ "license": "BSD-2-Clause", + "license": "BSD-2-Clause",
"dependencies": { "dependencies": {
@@ -4773,3 +4837,3 @@ @@ -3144,3 +3128,3 @@
"domelementtype": "^2.3.0", "domelementtype": "^2.3.0",
- "domhandler": "^5.0.1" - "domhandler": "^5.0.1"
+ "domhandler": "^5.0.3" + "domhandler": "^5.0.3"
}, },
@@ -5029,5 +5093,5 @@ @@ -3211,5 +3195,5 @@
"node_modules/emoji-regex": { "node_modules/emoji-regex": {
- "version": "8.0.0", - "version": "8.0.0",
- "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", - "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
@@ -565,7 +441,7 @@ index 1a544ba..78337cd 100644
+ "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz",
+ "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==", + "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==",
"dev": true, "dev": true,
@@ -5046,2 +5110,16 @@ @@ -3217,2 +3201,16 @@
}, },
+ "node_modules/encoding-sniffer": { + "node_modules/encoding-sniffer": {
+ "version": "0.2.1", + "version": "0.2.1",
@@ -582,7 +458,7 @@ index 1a544ba..78337cd 100644
+ } + }
+ }, + },
"node_modules/end-of-stream": { "node_modules/end-of-stream": {
@@ -5056,6 +5134,7 @@ @@ -3227,6 +3225,7 @@
"node_modules/entities": { "node_modules/entities": {
- "version": "4.4.0", - "version": "4.4.0",
- "resolved": "https://registry.npmjs.org/entities/-/entities-4.4.0.tgz", - "resolved": "https://registry.npmjs.org/entities/-/entities-4.4.0.tgz",
@@ -593,11 +469,7 @@ index 1a544ba..78337cd 100644
"dev": true, "dev": true,
+ "license": "BSD-2-Clause", + "license": "BSD-2-Clause",
"engines": { "engines": {
@@ -5150,2 +5229,3 @@ @@ -3367,16 +3366,2 @@
"dev": true,
+ "license": "MIT",
"optional": true
@@ -5213,16 +5293,2 @@
}, },
- "node_modules/esprima": { - "node_modules/esprima": {
- "version": "4.0.1", - "version": "4.0.1",
@@ -614,40 +486,19 @@ index 1a544ba..78337cd 100644
- } - }
- }, - },
"node_modules/events": { "node_modules/events": {
@@ -5241,2 +5307,3 @@ @@ -3418,2 +3403,3 @@
"dev": true,
+ "license": "(BSD-2-Clause OR MIT OR Apache-2.0)",
"optional": true,
@@ -5271,2 +5338,3 @@
"dev": true, "dev": true,
+ "license": "ISC", + "license": "ISC",
"dependencies": { "dependencies": {
@@ -5515,5 +5583,5 @@ @@ -3617,2 +3603,3 @@
"node_modules/form-data": {
- "version": "4.0.4",
- "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.4.tgz",
- "integrity": "sha512-KrGhL9Q4zjj0kiUt5OO4Mr/A/jlI2jDYs5eHBpYHPcBEVSiipAvn2Ko2HnPe20rmcuuvMHNdZFp+4IlGTMF0Ow==",
+ "version": "4.0.5",
+ "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.5.tgz",
+ "integrity": "sha512-8RipRLol37bNs2bhoV67fiTEvdTrbMUYcFTiy3+wuuOnUog2QBHCZWXDRijWQfAkhBj2Uf5UnVaiWwA5vdd82w==",
"dev": true, "dev": true,
@@ -5536,2 +5604,3 @@ + "license": "ISC",
"dev": true,
+ "license": "MIT",
"optional": true "optional": true
@@ -5576,2 +5645,3 @@ @@ -3924,2 +3911,3 @@
"hasInstallScript": true,
+ "license": "MIT",
"optional": true,
@@ -5703,2 +5773,3 @@
"dev": true,
+ "license": "MIT",
"optional": true,
@@ -5866,2 +5937,3 @@
"dev": true, "dev": true,
+ "license": "MIT", + "license": "MIT",
"engines": { "engines": {
@@ -5925,5 +5997,5 @@ @@ -3983,5 +3971,5 @@
"node_modules/htmlparser2": { "node_modules/htmlparser2": {
- "version": "8.0.1", - "version": "8.0.1",
- "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-8.0.1.tgz", - "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-8.0.1.tgz",
@@ -656,7 +507,7 @@ index 1a544ba..78337cd 100644
+ "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-10.0.0.tgz", + "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-10.0.0.tgz",
+ "integrity": "sha512-TwAZM+zE5Tq3lrEHvOlvwgj1XLWQCtaaibSN11Q+gGBAS7Y1uZSWwXXRe4iF6OXnaq1riyQAPFOBtYc77Mxq0g==", + "integrity": "sha512-TwAZM+zE5Tq3lrEHvOlvwgj1XLWQCtaaibSN11Q+gGBAS7Y1uZSWwXXRe4iF6OXnaq1riyQAPFOBtYc77Mxq0g==",
"dev": true, "dev": true,
@@ -5936,7 +6008,21 @@ @@ -3994,7 +3982,21 @@
], ],
+ "license": "MIT", + "license": "MIT",
"dependencies": { "dependencies": {
@@ -681,7 +532,23 @@ index 1a544ba..78337cd 100644
+ "funding": { + "funding": {
+ "url": "https://github.com/fb55/entities?sponsor=1" + "url": "https://github.com/fb55/entities?sponsor=1"
} }
@@ -6070,5 +6156,5 @@ @@ -4048,2 +4050,15 @@
},
+ "node_modules/iconv-lite": {
+ "version": "0.6.3",
+ "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz",
+ "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==",
+ "dev": true,
+ "license": "MIT",
+ "dependencies": {
+ "safer-buffer": ">= 2.1.2 < 3.0.0"
+ },
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
"node_modules/ieee754": {
@@ -4080,5 +4095,5 @@
"node_modules/index-to-position": { "node_modules/index-to-position": {
- "version": "1.1.0", - "version": "1.1.0",
- "resolved": "https://registry.npmjs.org/index-to-position/-/index-to-position-1.1.0.tgz", - "resolved": "https://registry.npmjs.org/index-to-position/-/index-to-position-1.1.0.tgz",
@@ -690,11 +557,11 @@ index 1a544ba..78337cd 100644
+ "resolved": "https://registry.npmjs.org/index-to-position/-/index-to-position-1.2.0.tgz", + "resolved": "https://registry.npmjs.org/index-to-position/-/index-to-position-1.2.0.tgz",
+ "integrity": "sha512-Yg7+ztRkqslMAS2iFaU+Oa4KTSidr63OsFGlOrJoW981kIYO3CGCS3wA95P1mUi/IVSJkn0D479KTJpVpvFNuw==", + "integrity": "sha512-Yg7+ztRkqslMAS2iFaU+Oa4KTSidr63OsFGlOrJoW981kIYO3CGCS3wA95P1mUi/IVSJkn0D479KTJpVpvFNuw==",
"dev": true, "dev": true,
@@ -6088,2 +6174,3 @@ @@ -4114,2 +4129,3 @@
"dev": true, "dev": true,
+ "license": "MIT", + "license": "MIT",
"dependencies": { "optional": true
@@ -6359,5 +6446,5 @@ @@ -4288,5 +4304,5 @@
"node_modules/js-yaml": { "node_modules/js-yaml": {
- "version": "3.14.2", - "version": "3.14.2",
- "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.2.tgz", - "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.2.tgz",
@@ -703,13 +570,25 @@ index 1a544ba..78337cd 100644
+ "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.1.tgz", + "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.1.tgz",
+ "integrity": "sha512-qQKT4zQxXl8lLwBtHMWwaTcGfFOZviOJet3Oy/xmGk2gZH677CJM9EvtfdSkgWcATZhj/55JZ0rmy3myCT5lsA==", + "integrity": "sha512-qQKT4zQxXl8lLwBtHMWwaTcGfFOZviOJet3Oy/xmGk2gZH677CJM9EvtfdSkgWcATZhj/55JZ0rmy3myCT5lsA==",
"dev": true, "dev": true,
@@ -6365,4 +6452,3 @@ @@ -4294,4 +4310,3 @@
"dependencies": { "dependencies": {
- "argparse": "^1.0.7", - "argparse": "^1.0.7",
- "esprima": "^4.0.0" - "esprima": "^4.0.0"
+ "argparse": "^2.0.1" + "argparse": "^2.0.1"
}, },
@@ -6725,9 +6811,2 @@ @@ -4360,2 +4375,3 @@
"dev": true,
+ "license": "BSD-2-Clause",
"dependencies": {
@@ -4438,2 +4454,3 @@
"hasInstallScript": true,
+ "license": "MIT",
"optional": true,
@@ -4449,2 +4466,3 @@
"dev": true,
+ "license": "MIT",
"dependencies": {
@@ -4531,9 +4549,2 @@
}, },
- "node_modules/markdown-it/node_modules/argparse": { - "node_modules/markdown-it/node_modules/argparse": {
- "version": "2.0.1", - "version": "2.0.1",
@@ -719,7 +598,19 @@ index 1a544ba..78337cd 100644
- "license": "Python-2.0" - "license": "Python-2.0"
- }, - },
"node_modules/matcher": { "node_modules/matcher": {
@@ -7047,6 +7126,7 @@ @@ -4543,2 +4554,3 @@
"dev": true,
+ "license": "(MIT OR WTFPL)",
"optional": true,
@@ -4556,2 +4568,3 @@
"dev": true,
+ "license": "MIT",
"optional": true,
@@ -4693,2 +4706,3 @@
"dev": true,
+ "license": "ISC",
"optional": true
@@ -4709,6 +4723,7 @@
"node_modules/napi-build-utils": { "node_modules/napi-build-utils": {
- "version": "1.0.2", - "version": "1.0.2",
- "resolved": "https://registry.npmjs.org/napi-build-utils/-/napi-build-utils-1.0.2.tgz", - "resolved": "https://registry.npmjs.org/napi-build-utils/-/napi-build-utils-1.0.2.tgz",
@@ -730,7 +621,11 @@ index 1a544ba..78337cd 100644
"dev": true, "dev": true,
+ "license": "MIT", + "license": "MIT",
"optional": true "optional": true
@@ -7205,5 +7285,5 @@ @@ -4755,2 +4770,3 @@
"dev": true,
+ "license": "MIT",
"optional": true
@@ -4770,5 +4786,5 @@
"node_modules/node-sarif-builder": { "node_modules/node-sarif-builder": {
- "version": "3.2.0", - "version": "3.2.0",
- "resolved": "https://registry.npmjs.org/node-sarif-builder/-/node-sarif-builder-3.2.0.tgz", - "resolved": "https://registry.npmjs.org/node-sarif-builder/-/node-sarif-builder-3.2.0.tgz",
@@ -739,7 +634,12 @@ index 1a544ba..78337cd 100644
+ "resolved": "https://registry.npmjs.org/node-sarif-builder/-/node-sarif-builder-3.3.1.tgz", + "resolved": "https://registry.npmjs.org/node-sarif-builder/-/node-sarif-builder-3.3.1.tgz",
+ "integrity": "sha512-8z5dAbhpxmk/WRQHXlv4V0h+9Y4Ugk+w08lyhV/7E/CQX9yDdBc3025/EG+RSMJU2aPFh/IQ7XDV7Ti5TLt/TA==", + "integrity": "sha512-8z5dAbhpxmk/WRQHXlv4V0h+9Y4Ugk+w08lyhV/7E/CQX9yDdBc3025/EG+RSMJU2aPFh/IQ7XDV7Ti5TLt/TA==",
"dev": true, "dev": true,
@@ -7308,5 +7388,5 @@ @@ -4780,3 +4796,3 @@
"engines": {
- "node": ">=18"
+ "node": ">=20"
}
@@ -4857,5 +4873,5 @@
"node_modules/normalize-package-data/node_modules/semver": { "node_modules/normalize-package-data/node_modules/semver": {
- "version": "7.7.2", - "version": "7.7.2",
- "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.2.tgz", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.2.tgz",
@@ -748,7 +648,7 @@ index 1a544ba..78337cd 100644
+ "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.3.tgz", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.3.tgz",
+ "integrity": "sha512-SdsKMrI9TdgjdweUSR9MweHA4EJ8YxHn8DFaDisvhVlUOe4BF1tLD7GAj0lIqWVl+dPb/rExr0Btby5loQm20Q==", + "integrity": "sha512-SdsKMrI9TdgjdweUSR9MweHA4EJ8YxHn8DFaDisvhVlUOe4BF1tLD7GAj0lIqWVl+dPb/rExr0Btby5loQm20Q==",
"dev": true, "dev": true,
@@ -7575,5 +7655,5 @@ @@ -4985,5 +5001,5 @@
"node_modules/p-map": { "node_modules/p-map": {
- "version": "7.0.3", - "version": "7.0.3",
- "resolved": "https://registry.npmjs.org/p-map/-/p-map-7.0.3.tgz", - "resolved": "https://registry.npmjs.org/p-map/-/p-map-7.0.3.tgz",
@@ -757,7 +657,7 @@ index 1a544ba..78337cd 100644
+ "resolved": "https://registry.npmjs.org/p-map/-/p-map-7.0.4.tgz", + "resolved": "https://registry.npmjs.org/p-map/-/p-map-7.0.4.tgz",
+ "integrity": "sha512-tkAQEw8ysMzmkhgw8k+1U/iPhWNhykKnSk4Rd5zLoPJCuJaGRPo6YposrZgaxHKzDHdDWWZvE/Sk7hsL2X/CpQ==", + "integrity": "sha512-tkAQEw8ysMzmkhgw8k+1U/iPhWNhykKnSk4Rd5zLoPJCuJaGRPo6YposrZgaxHKzDHdDWWZvE/Sk7hsL2X/CpQ==",
"dev": true, "dev": true,
@@ -7653,8 +7733,9 @@ @@ -5063,8 +5079,9 @@
"node_modules/parse5": { "node_modules/parse5": {
- "version": "7.1.2", - "version": "7.1.2",
- "resolved": "https://registry.npmjs.org/parse5/-/parse5-7.1.2.tgz", - "resolved": "https://registry.npmjs.org/parse5/-/parse5-7.1.2.tgz",
@@ -771,7 +671,7 @@ index 1a544ba..78337cd 100644
- "entities": "^4.4.0" - "entities": "^4.4.0"
+ "entities": "^6.0.0" + "entities": "^6.0.0"
}, },
@@ -7665,8 +7746,22 @@ @@ -5075,8 +5092,22 @@
"node_modules/parse5-htmlparser2-tree-adapter": { "node_modules/parse5-htmlparser2-tree-adapter": {
- "version": "7.0.0", - "version": "7.0.0",
- "resolved": "https://registry.npmjs.org/parse5-htmlparser2-tree-adapter/-/parse5-htmlparser2-tree-adapter-7.0.0.tgz", - "resolved": "https://registry.npmjs.org/parse5-htmlparser2-tree-adapter/-/parse5-htmlparser2-tree-adapter-7.0.0.tgz",
@@ -798,7 +698,7 @@ index 1a544ba..78337cd 100644
"dependencies": { "dependencies": {
- "domhandler": "^5.0.2", - "domhandler": "^5.0.2",
"parse5": "^7.0.0" "parse5": "^7.0.0"
@@ -7677,2 +7772,15 @@ @@ -5087,2 +5118,15 @@
}, },
+ "node_modules/parse5/node_modules/entities": { + "node_modules/parse5/node_modules/entities": {
+ "version": "6.0.1", + "version": "6.0.1",
@@ -814,7 +714,7 @@ index 1a544ba..78337cd 100644
+ } + }
+ }, + },
"node_modules/path-is-absolute": { "node_modules/path-is-absolute": {
@@ -7696,5 +7804,5 @@ @@ -5106,5 +5150,5 @@
"node_modules/path-scurry": { "node_modules/path-scurry": {
- "version": "2.0.0", - "version": "2.0.0",
- "resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-2.0.0.tgz", - "resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-2.0.0.tgz",
@@ -823,23 +723,20 @@ index 1a544ba..78337cd 100644
+ "resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-2.0.1.tgz", + "resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-2.0.1.tgz",
+ "integrity": "sha512-oWyT4gICAu+kaA7QWk/jvCHWarMKNs6pXOGWKDTr7cw4IGcUbW+PeTfbaQiLGheFRpjo6O9J0PmyMfQPjH71oA==", + "integrity": "sha512-oWyT4gICAu+kaA7QWk/jvCHWarMKNs6pXOGWKDTr7cw4IGcUbW+PeTfbaQiLGheFRpjo6O9J0PmyMfQPjH71oA==",
"dev": true, "dev": true,
@@ -7838,6 +7946,7 @@ @@ -5237,2 +5281,3 @@
"node_modules/prebuild-install": {
- "version": "7.1.1",
- "resolved": "https://registry.npmjs.org/prebuild-install/-/prebuild-install-7.1.1.tgz",
- "integrity": "sha512-jAXscXWMcCK8GgCoHOfIr0ODh5ai8mj63L2nWrjuAgXE6tDyYGnx4/8o/rCgU+B4JSyZBKbeZqzhtwtC3ovxjw==",
+ "version": "7.1.3",
+ "resolved": "https://registry.npmjs.org/prebuild-install/-/prebuild-install-7.1.3.tgz",
+ "integrity": "sha512-8Mf2cbV7x1cXPUILADGI3wuhfqWvtiLA1iclTDbFRZkgRQS0NqsPZphna9V+HyTEadheuPmjaJMsbzKQFOzLug==",
"dev": true, "dev": true,
+ "license": "MIT", + "license": "(BSD-2-Clause OR MIT OR Apache-2.0)",
"optional": true, "optional": true,
@@ -7849,3 +7958,3 @@ @@ -5244,3 +5289,3 @@
"mkdirp-classic": "^0.5.3", "mkdirp-classic": "^0.5.3",
- "napi-build-utils": "^1.0.1", - "napi-build-utils": "^1.0.1",
+ "napi-build-utils": "^2.0.0", + "napi-build-utils": "^2.0.0",
"node-abi": "^3.3.0", "node-abi": "^3.3.0",
@@ -8024,22 +8133,2 @@ @@ -5292,2 +5337,3 @@
"dev": true,
+ "license": "ISC",
"dependencies": {
@@ -5385,22 +5431,2 @@
}, },
- "node_modules/rc-config-loader/node_modules/argparse": { - "node_modules/rc-config-loader/node_modules/argparse": {
- "version": "2.0.1", - "version": "2.0.1",
@@ -862,7 +759,15 @@ index 1a544ba..78337cd 100644
- } - }
- }, - },
"node_modules/read": { "node_modules/read": {
@@ -8320,6 +8409,7 @@ @@ -5591,7 +5617,15 @@
},
+ "node_modules/safer-buffer": {
+ "version": "2.1.2",
+ "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
+ "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==",
+ "dev": true,
+ "license": "MIT"
+ },
"node_modules/sax": { "node_modules/sax": {
- "version": "1.2.4", - "version": "1.2.4",
- "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz", - "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz",
@@ -874,15 +779,27 @@ index 1a544ba..78337cd 100644
+ "dev": true, + "dev": true,
+ "license": "ISC" + "license": "ISC"
}, },
@@ -8517,2 +8607,3 @@ @@ -5642,2 +5676,3 @@
"dev": true,
+ "license": "MIT",
"optional": true
@@ -5649,2 +5684,3 @@
"dev": true,
+ "license": "MIT",
"optional": true,
@@ -5789,2 +5825,3 @@
], ],
+ "license": "BSD-3-Clause", + "license": "BSD-3-Clause",
"optional": true "optional": true
@@ -8538,2 +8629,3 @@ @@ -5810,2 +5847,3 @@
], ],
+ "license": "MIT", + "license": "MIT",
"optional": true, "optional": true,
@@ -8771,5 +8863,5 @@ @@ -5889,2 +5927,3 @@
"dev": true,
+ "license": "MIT",
"engines": {
@@ -5968,5 +6007,5 @@
"node_modules/string-width": { "node_modules/string-width": {
- "version": "4.2.3", - "version": "4.2.3",
- "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
@@ -891,7 +808,7 @@ index 1a544ba..78337cd 100644
+ "resolved": "https://registry.npmjs.org/string-width/-/string-width-5.1.2.tgz", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-5.1.2.tgz",
+ "integrity": "sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==", + "integrity": "sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==",
"dev": true, "dev": true,
@@ -8793,31 +8885,11 @@ @@ -5990,31 +6029,11 @@
"dependencies": { "dependencies": {
- "emoji-regex": "^8.0.0", - "emoji-regex": "^8.0.0",
- "is-fullwidth-code-point": "^3.0.0", - "is-fullwidth-code-point": "^3.0.0",
@@ -929,7 +846,7 @@ index 1a544ba..78337cd 100644
+ "funding": { + "funding": {
+ "url": "https://github.com/sponsors/sindresorhus" + "url": "https://github.com/sponsors/sindresorhus"
} }
@@ -8834,2 +8906,9 @@ @@ -6031,2 +6050,9 @@
}, },
+ "node_modules/string-width/node_modules/emoji-regex": { + "node_modules/string-width/node_modules/emoji-regex": {
+ "version": "8.0.0", + "version": "8.0.0",
@@ -939,14 +856,18 @@ index 1a544ba..78337cd 100644
+ "license": "MIT" + "license": "MIT"
+ }, + },
"node_modules/string-width/node_modules/strip-ansi": { "node_modules/string-width/node_modules/strip-ansi": {
@@ -8927,4 +9006,5 @@ @@ -6124,4 +6150,5 @@
"resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz", "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz",
- "integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo= sha512-4gB8na07fecVVkOI6Rs4e7T6NOTki5EmL7TUduTs6bu3EdnSycntVJ4re8kgZA+wx9IueI2Y11bfbgwtzuE0KQ==", - "integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo= sha512-4gB8na07fecVVkOI6Rs4e7T6NOTki5EmL7TUduTs6bu3EdnSycntVJ4re8kgZA+wx9IueI2Y11bfbgwtzuE0KQ==",
+ "integrity": "sha512-4gB8na07fecVVkOI6Rs4e7T6NOTki5EmL7TUduTs6bu3EdnSycntVJ4re8kgZA+wx9IueI2Y11bfbgwtzuE0KQ==", + "integrity": "sha512-4gB8na07fecVVkOI6Rs4e7T6NOTki5EmL7TUduTs6bu3EdnSycntVJ4re8kgZA+wx9IueI2Y11bfbgwtzuE0KQ==",
"dev": true, "dev": true,
+ "license": "MIT", + "license": "MIT",
"optional": true, "optional": true,
@@ -9042,2 +9122,24 @@ @@ -6159,2 +6186,3 @@
"dev": true,
+ "license": "MIT",
"dependencies": {
@@ -6245,2 +6273,24 @@
}, },
+ "node_modules/table/node_modules/emoji-regex": { + "node_modules/table/node_modules/emoji-regex": {
+ "version": "8.0.0", + "version": "8.0.0",
@@ -971,7 +892,7 @@ index 1a544ba..78337cd 100644
+ } + }
+ }, + },
"node_modules/table/node_modules/strip-ansi": { "node_modules/table/node_modules/strip-ansi": {
@@ -9310,5 +9412,5 @@ @@ -6376,5 +6426,5 @@
"node_modules/tmp": { "node_modules/tmp": {
- "version": "0.2.4", - "version": "0.2.4",
- "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.2.4.tgz", - "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.2.4.tgz",
@@ -980,26 +901,14 @@ index 1a544ba..78337cd 100644
+ "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.2.5.tgz", + "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.2.5.tgz",
+ "integrity": "sha512-voyz6MApa1rQGUxT3E+BK7/ROe8itEx7vD8/HEvt4xwXucvQ5G5oeEiHkmHZJuBO21RpOf+YYm9MOivj709jow==", + "integrity": "sha512-voyz6MApa1rQGUxT3E+BK7/ROe8itEx7vD8/HEvt4xwXucvQ5G5oeEiHkmHZJuBO21RpOf+YYm9MOivj709jow==",
"dev": true, "dev": true,
@@ -9435,6 +9537,7 @@ @@ -6500,4 +6550,5 @@
"node_modules/tslib": {
- "version": "2.6.3",
- "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.3.tgz",
- "integrity": "sha512-xNvxJEOUiWPGhUuUdQgAJPKOOJfGnIyKySOc09XkKsgdUV/3E2zvwZYdejjmRgPCgcym1juLH3226yA7sEFJKQ==",
- "dev": true
+ "version": "2.8.1",
+ "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz",
+ "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==",
+ "dev": true,
+ "license": "0BSD"
},
@@ -9453,4 +9556,5 @@
"resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz", "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
- "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0= sha512-McnNiV1l8RYeY8tBgEpuodCC1mLUdbSN+CYBL7kJsJNInOP8UjDDEwdk6Mw60vdLLrr5NHKZhMAOSrR2NZuQ+w==", - "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0= sha512-McnNiV1l8RYeY8tBgEpuodCC1mLUdbSN+CYBL7kJsJNInOP8UjDDEwdk6Mw60vdLLrr5NHKZhMAOSrR2NZuQ+w==",
+ "integrity": "sha512-McnNiV1l8RYeY8tBgEpuodCC1mLUdbSN+CYBL7kJsJNInOP8UjDDEwdk6Mw60vdLLrr5NHKZhMAOSrR2NZuQ+w==", + "integrity": "sha512-McnNiV1l8RYeY8tBgEpuodCC1mLUdbSN+CYBL7kJsJNInOP8UjDDEwdk6Mw60vdLLrr5NHKZhMAOSrR2NZuQ+w==",
"dev": true, "dev": true,
+ "license": "Apache-2.0", + "license": "Apache-2.0",
"optional": true, "optional": true,
@@ -9502,2 +9606,12 @@ @@ -6549,2 +6600,12 @@
}, },
+ "node_modules/undici": { + "node_modules/undici": {
+ "version": "7.16.0", + "version": "7.16.0",
@@ -1012,13 +921,13 @@ index 1a544ba..78337cd 100644
+ } + }
+ }, + },
"node_modules/undici-types": { "node_modules/undici-types": {
@@ -9577,3 +9691,4 @@ @@ -6588,3 +6649,4 @@
"integrity": "sha512-jk1+QP6ZJqyOiuEI9AEWQfju/nB2Pw466kbA0LEZljHwKeMgd9WrAEgEGxjPDD2+TNbbb37rTyhEfrCXfuKXnA==", "integrity": "sha512-jk1+QP6ZJqyOiuEI9AEWQfju/nB2Pw466kbA0LEZljHwKeMgd9WrAEgEGxjPDD2+TNbbb37rTyhEfrCXfuKXnA==",
- "dev": true - "dev": true
+ "dev": true, + "dev": true,
+ "license": "MIT" + "license": "MIT"
}, },
@@ -9790,2 +9905,25 @@ @@ -6768,2 +6830,25 @@
}, },
+ "node_modules/whatwg-encoding": { + "node_modules/whatwg-encoding": {
+ "version": "3.1.1", + "version": "3.1.1",
@@ -1044,7 +953,7 @@ index 1a544ba..78337cd 100644
+ } + }
+ }, + },
"node_modules/which": { "node_modules/which": {
@@ -9894,2 +10032,24 @@ @@ -6872,2 +6957,24 @@
}, },
+ "node_modules/wrap-ansi-cjs/node_modules/emoji-regex": { + "node_modules/wrap-ansi-cjs/node_modules/emoji-regex": {
+ "version": "8.0.0", + "version": "8.0.0",
@@ -1069,7 +978,7 @@ index 1a544ba..78337cd 100644
+ } + }
+ }, + },
"node_modules/wrap-ansi-cjs/node_modules/strip-ansi": { "node_modules/wrap-ansi-cjs/node_modules/strip-ansi": {
@@ -9920,27 +10080,2 @@ @@ -6898,27 +7005,2 @@
}, },
- "node_modules/wrap-ansi/node_modules/emoji-regex": { - "node_modules/wrap-ansi/node_modules/emoji-regex": {
- "version": "9.2.2", - "version": "9.2.2",
@@ -1097,13 +1006,13 @@ index 1a544ba..78337cd 100644
- } - }
- }, - },
"node_modules/wrappy": { "node_modules/wrappy": {
@@ -10036,2 +10171,47 @@ @@ -6975,2 +7057,47 @@
}, },
+ "node_modules/yargs/node_modules/ansi-regex": { + "node_modules/yargs/node_modules/ansi-regex": {
+ "version": "5.0.1", + "version": "5.0.1",
+ "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
+ "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", + "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
+ "dev": true, + "extraneous": true,
+ "license": "MIT", + "license": "MIT",
+ "engines": { + "engines": {
+ "node": ">=8" + "node": ">=8"
@@ -1113,14 +1022,14 @@ index 1a544ba..78337cd 100644
+ "version": "8.0.0", + "version": "8.0.0",
+ "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
+ "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", + "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
+ "dev": true, + "extraneous": true,
+ "license": "MIT" + "license": "MIT"
+ }, + },
+ "node_modules/yargs/node_modules/string-width": { + "node_modules/yargs/node_modules/string-width": {
+ "version": "4.2.3", + "version": "4.2.3",
+ "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
+ "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", + "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
+ "dev": true, + "extraneous": true,
+ "license": "MIT", + "license": "MIT",
+ "dependencies": { + "dependencies": {
+ "emoji-regex": "^8.0.0", + "emoji-regex": "^8.0.0",
@@ -1135,7 +1044,7 @@ index 1a544ba..78337cd 100644
+ "version": "6.0.1", + "version": "6.0.1",
+ "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
+ "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", + "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
+ "dev": true, + "extraneous": true,
+ "license": "MIT", + "license": "MIT",
+ "dependencies": { + "dependencies": {
+ "ansi-regex": "^5.0.1" + "ansi-regex": "^5.0.1"
@@ -1146,7 +1055,7 @@ index 1a544ba..78337cd 100644
+ }, + },
"node_modules/yauzl": { "node_modules/yauzl": {
diff --git a/build/package.json b/build/package.json diff --git a/build/package.json b/build/package.json
index e45161d..30ba3c3 100644 index 785f04f..e523427 100644
--- a/build/package.json --- a/build/package.json
+++ b/build/package.json +++ b/build/package.json
@@ -11,3 +11,2 @@ @@ -11,3 +11,2 @@

124
patches/version-1-update.patch
View File

@@ -1,5 +1,5 @@
diff --git a/src/vs/platform/update/common/update.ts b/src/vs/platform/update/common/update.ts diff --git a/src/vs/platform/update/common/update.ts b/src/vs/platform/update/common/update.ts
index 8e3db7c..1a3226c 100644 index cbeb3a6..bc382cc 100644
--- a/src/vs/platform/update/common/update.ts --- a/src/vs/platform/update/common/update.ts
+++ b/src/vs/platform/update/common/update.ts +++ b/src/vs/platform/update/common/update.ts
@@ -54,3 +54,4 @@ export const enum UpdateType { @@ -54,3 +54,4 @@ export const enum UpdateType {
@@ -8,7 +8,7 @@ index 8e3db7c..1a3226c 100644
+ Snap, + Snap,
+ WindowsInstaller, + WindowsInstaller,
} }
@@ -116 +117,38 @@ export interface IUpdateService { @@ -120 +121,38 @@ export interface IUpdateService {
} }
+ +
+export type Architecture = +export type Architecture =
@@ -49,44 +49,47 @@ index 8e3db7c..1a3226c 100644
+ | "user"; + | "user";
\ No newline at end of file \ No newline at end of file
diff --git a/src/vs/platform/update/electron-main/abstractUpdateService.ts b/src/vs/platform/update/electron-main/abstractUpdateService.ts diff --git a/src/vs/platform/update/electron-main/abstractUpdateService.ts b/src/vs/platform/update/electron-main/abstractUpdateService.ts
index 05c4489..59d0bd7 100644 index 3e5956f..b3685bb 100644
--- a/src/vs/platform/update/electron-main/abstractUpdateService.ts --- a/src/vs/platform/update/electron-main/abstractUpdateService.ts
+++ b/src/vs/platform/update/electron-main/abstractUpdateService.ts +++ b/src/vs/platform/update/electron-main/abstractUpdateService.ts
@@ -17,3 +17,3 @@ import { IProductService } from '../../product/common/productService.js'; @@ -18,3 +18,3 @@ import { IProductService } from '../../product/common/productService.js';
import { IRequestService } from '../../request/common/request.js'; import { IRequestService } from '../../request/common/request.js';
-import { AvailableForDownload, DisablementReason, IUpdateService, State, StateType, UpdateType } from '../common/update.js'; -import { AvailableForDownload, DisablementReason, IUpdateService, State, StateType, UpdateType } from '../common/update.js';
+import { Architecture, AvailableForDownload, DisablementReason, IUpdateService, Platform, State, StateType, Target, UpdateType } from '../common/update.js'; +import { Architecture, AvailableForDownload, DisablementReason, IUpdateService, Platform, State, StateType, Target, UpdateType } from '../common/update.js';
@@ -23,10 +23,8 @@ export interface IUpdateURLOptions { @@ -25,12 +25,8 @@ export interface IUpdateURLOptions {
-export function createUpdateURL(baseUpdateUrl: string, platform: string, quality: string, commit: string, options?: IUpdateURLOptions): string { -export function createUpdateURL(baseUpdateUrl: string, platform: string, quality: string, commit: string, options?: IUpdateURLOptions): string {
- const url = new URL(`${baseUpdateUrl}/api/update/${platform}/${quality}/${commit}`); - const url = new URL(`${baseUpdateUrl}/api/update/${platform}/${quality}/${commit}`);
- -
- if (options?.background) { - if (options?.background) {
- url.searchParams.set('bg', 'true'); - url.searchParams.set('bg', 'true');
- }
-
- url.searchParams.set('u', options?.internalOrg ?? 'none');
-
- return url.toString();
+export function createUpdateURL(productService: IProductService, quality: string, platform: Platform, architecture: Architecture, target?: Target): string { +export function createUpdateURL(productService: IProductService, quality: string, platform: Platform, architecture: Architecture, target?: Target): string {
+ if (target) { + if (target) {
+ return `${productService.updateUrl}/${quality}/${platform}/${architecture}/${target}/latest.json`; + return `${productService.updateUrl}/${quality}/${platform}/${architecture}/${target}/latest.json`;
+ } else { + } else {
+ return `${productService.updateUrl}/${quality}/${platform}/${architecture}/latest.json`; + return `${productService.updateUrl}/${quality}/${platform}/${architecture}/latest.json`;
} + }
-
- return url.toString();
} }
@@ -299,3 +297,3 @@ export abstract class AbstractUpdateService implements IUpdateService { @@ -315,3 +311,3 @@ export abstract class AbstractUpdateService implements IUpdateService {
- if (mode === 'none') { - if (mode === 'none') {
+ if (mode === 'none' || mode === 'manual') { + if (mode === 'none' || mode === 'manual') {
return undefined; return undefined;
diff --git a/src/vs/platform/update/electron-main/updateService.darwin.ts b/src/vs/platform/update/electron-main/updateService.darwin.ts diff --git a/src/vs/platform/update/electron-main/updateService.darwin.ts b/src/vs/platform/update/electron-main/updateService.darwin.ts
index e65a982..950291b 100644 index 842c676..974d411 100644
--- a/src/vs/platform/update/electron-main/updateService.darwin.ts --- a/src/vs/platform/update/electron-main/updateService.darwin.ts
+++ b/src/vs/platform/update/electron-main/updateService.darwin.ts +++ b/src/vs/platform/update/electron-main/updateService.darwin.ts
@@ -21,2 +21,3 @@ import { IMeteredConnectionService } from '../../meteredConnection/common/metere @@ -22,2 +22,3 @@ import { AbstractUpdateService, createUpdateURL, getUpdateRequestHeaders, IUpdat
import { AbstractUpdateService, createUpdateURL, getUpdateRequestHeaders, IUpdateURLOptions, UpdateErrorClassification } from './abstractUpdateService.js'; import { INodeProcess } from '../../../base/common/platform.js';
+import * as semver from 'semver'; +import * as semver from 'semver';
@@ -90,16 +91,5 @@ export class DarwinUpdateService extends AbstractUpdateService implements IRelau @@ -97,16 +98,5 @@ export class DarwinUpdateService extends AbstractUpdateService implements IRelau
- protected buildUpdateFeedUrl(quality: string, commit: string, options?: IUpdateURLOptions): string | undefined { - protected buildUpdateFeedUrl(quality: string, commit: string, options?: IUpdateURLOptions): string | undefined {
- const assetID = this.productService.darwinUniversalAssetId ?? (process.arch === 'x64' ? 'darwin' : 'darwin-arm64'); - const assetID = this.productService.darwinUniversalAssetId ?? (process.arch === 'x64' ? 'darwin' : 'darwin-arm64');
@@ -106,7 +109,7 @@ index e65a982..950291b 100644
+ return createUpdateURL(this.productService, quality, process.platform, process.arch); + return createUpdateURL(this.productService, quality, process.platform, process.arch);
+ } + }
@@ -137,3 +127,30 @@ export class DarwinUpdateService extends AbstractUpdateService implements IRelau @@ -145,3 +135,30 @@ export class DarwinUpdateService extends AbstractUpdateService implements IRelau
this.logService.trace('update#doCheckForUpdates - using Electron autoUpdater', { url, explicit, background }); this.logService.trace('update#doCheckForUpdates - using Electron autoUpdater', { url, explicit, background });
- electron.autoUpdater.checkForUpdates(); - electron.autoUpdater.checkForUpdates();
+ this.requestService.request({ url }, CancellationToken.None) + this.requestService.request({ url }, CancellationToken.None)
@@ -139,7 +142,7 @@ index e65a982..950291b 100644
+ }); + });
} }
diff --git a/src/vs/platform/update/electron-main/updateService.linux.ts b/src/vs/platform/update/electron-main/updateService.linux.ts diff --git a/src/vs/platform/update/electron-main/updateService.linux.ts b/src/vs/platform/update/electron-main/updateService.linux.ts
index ee4b291..01d0d9d 100644 index 3ace29f..651b38c 100644
--- a/src/vs/platform/update/electron-main/updateService.linux.ts --- a/src/vs/platform/update/electron-main/updateService.linux.ts
+++ b/src/vs/platform/update/electron-main/updateService.linux.ts +++ b/src/vs/platform/update/electron-main/updateService.linux.ts
@@ -16,2 +16,3 @@ import { AvailableForDownload, IUpdate, State, UpdateType } from '../common/upda @@ -16,2 +16,3 @@ import { AvailableForDownload, IUpdate, State, UpdateType } from '../common/upda
@@ -153,7 +156,7 @@ index ee4b291..01d0d9d 100644
+ protected buildUpdateFeedUrl(quality: string, _commit: string, _options?: IUpdateURLOptions): string { + protected buildUpdateFeedUrl(quality: string, _commit: string, _options?: IUpdateURLOptions): string {
+ return createUpdateURL(this.productService, quality, process.platform, process.arch); + return createUpdateURL(this.productService, quality, process.platform, process.arch);
} }
@@ -50,5 +51,17 @@ export class LinuxUpdateService extends AbstractUpdateService { @@ -51,5 +52,17 @@ export class LinuxUpdateService extends AbstractUpdateService {
this.setState(State.Idle(UpdateType.Archive)); this.setState(State.Idle(UpdateType.Archive));
- } else { - } else {
+ +
@@ -173,22 +176,23 @@ index ee4b291..01d0d9d 100644
+ return Promise.resolve(null); + return Promise.resolve(null);
}) })
diff --git a/src/vs/platform/update/electron-main/updateService.win32.ts b/src/vs/platform/update/electron-main/updateService.win32.ts diff --git a/src/vs/platform/update/electron-main/updateService.win32.ts b/src/vs/platform/update/electron-main/updateService.win32.ts
index da4c875..fa634dc 100644 index 25535f2..7ef2f1b 100644
--- a/src/vs/platform/update/electron-main/updateService.win32.ts --- a/src/vs/platform/update/electron-main/updateService.win32.ts
+++ b/src/vs/platform/update/electron-main/updateService.win32.ts +++ b/src/vs/platform/update/electron-main/updateService.win32.ts
@@ -14,3 +14,2 @@ import { CancellationToken, CancellationTokenSource } from '../../../base/common @@ -14,3 +14,2 @@ import { CancellationToken, CancellationTokenSource } from '../../../base/common
import { memoize } from '../../../base/common/decorators.js'; import { memoize } from '../../../base/common/decorators.js';
-import { hash } from '../../../base/common/hash.js'; -import { hash } from '../../../base/common/hash.js';
import * as path from '../../../base/common/path.js'; import * as path from '../../../base/common/path.js';
@@ -31,4 +30,5 @@ import { asJson, IRequestService } from '../../request/common/request.js'; @@ -33,5 +32,6 @@ import { asJson, IRequestService } from '../../request/common/request.js';
import { ITelemetryService } from '../../telemetry/common/telemetry.js'; import { ITelemetryService } from '../../telemetry/common/telemetry.js';
-import { AvailableForDownload, DisablementReason, IUpdate, State, StateType, UpdateType } from '../common/update.js'; -import { AvailableForDownload, DisablementReason, IUpdate, State, StateType, UpdateType } from '../common/update.js';
-import { AbstractUpdateService, createUpdateURL, IUpdateURLOptions, UpdateErrorClassification } from './abstractUpdateService.js'; -import { AbstractUpdateService, createUpdateURL, getUpdateRequestHeaders, IUpdateURLOptions, UpdateErrorClassification } from './abstractUpdateService.js';
+import { AvailableForDownload, DisablementReason, IUpdate, State, StateType, Target, UpdateType } from '../common/update.js'; +import { AvailableForDownload, DisablementReason, IUpdate, State, StateType, Target, UpdateType } from '../common/update.js';
+import { AbstractUpdateService, createUpdateURL, IUpdateURLOptions } from './abstractUpdateService.js'; +import { AbstractUpdateService, createUpdateURL, getUpdateRequestHeaders, IUpdateURLOptions } from './abstractUpdateService.js';
import { INodeProcess } from '../../../base/common/platform.js';
+import * as semver from 'semver'; +import * as semver from 'semver';
@@ -46,5 +46,9 @@ function getUpdateType(): UpdateType { @@ -49,5 +49,9 @@ function getUpdateType(): UpdateType {
if (typeof _updateType === 'undefined') { if (typeof _updateType === 'undefined') {
- _updateType = existsSync(path.join(path.dirname(process.execPath), 'unins000.exe')) - _updateType = existsSync(path.join(path.dirname(process.execPath), 'unins000.exe'))
- ? UpdateType.Setup - ? UpdateType.Setup
@@ -201,16 +205,12 @@ index da4c875..fa634dc 100644
+ _updateType = UpdateType.Archive; + _updateType = UpdateType.Archive;
+ } + }
} }
@@ -68,2 +72,3 @@ export class Win32UpdateService extends AbstractUpdateService implements IRelaun @@ -162,3 +166,3 @@ export class Win32UpdateService extends AbstractUpdateService implements IRelaun
@IConfigurationService configurationService: IConfigurationService,
+ // @ts-expect-error
@ITelemetryService private readonly telemetryService: ITelemetryService,
@@ -140,3 +145,3 @@ export class Win32UpdateService extends AbstractUpdateService implements IRelaun
} else { } else {
- const fastUpdatesEnabled = this.configurationService.getValue('update.enableWindowsBackgroundUpdates'); - const fastUpdatesEnabled = this.configurationService.getValue('update.enableWindowsBackgroundUpdates');
+ const fastUpdatesEnabled = getUpdateType() === UpdateType.Setup && this.configurationService.getValue('update.enableWindowsBackgroundUpdates'); + const fastUpdatesEnabled = getUpdateType() === UpdateType.Setup && this.configurationService.getValue('update.enableWindowsBackgroundUpdates');
// GC for background updates in system setup happens via inno_setup since it requires // GC for background updates in system setup happens via inno_setup since it requires
@@ -158,12 +163,22 @@ export class Win32UpdateService extends AbstractUpdateService implements IRelaun @@ -180,12 +184,22 @@ export class Win32UpdateService extends AbstractUpdateService implements IRelaun
- protected buildUpdateFeedUrl(quality: string, commit: string, options?: IUpdateURLOptions): string | undefined { - protected buildUpdateFeedUrl(quality: string, commit: string, options?: IUpdateURLOptions): string | undefined {
- let platform = `win32-${process.arch}`; - let platform = `win32-${process.arch}`;
@@ -242,7 +242,7 @@ index da4c875..fa634dc 100644
- return createUpdateURL(this.productService.updateUrl!, platform, quality, commit, options); - return createUpdateURL(this.productService.updateUrl!, platform, quality, commit, options);
+ return createUpdateURL(this.productService, quality, process.platform, process.arch, target); + return createUpdateURL(this.productService, quality, process.platform, process.arch, target);
} }
@@ -200,2 +215,10 @@ export class Win32UpdateService extends AbstractUpdateService implements IRelaun @@ -224,2 +238,10 @@ export class Win32UpdateService extends AbstractUpdateService implements IRelaun
+ const fetchedVersion = /\d+\.\d+\.\d+\.\d+/.test(update.productVersion) ? update.productVersion.replace(/(\d+\.\d+\.\d+)\.\d+(\-\w+)?/, '$1$2') : update.productVersion.replace(/(\d+\.\d+\.)0+(\d+)(\-\w+)?/, '$1$2$3') + const fetchedVersion = /\d+\.\d+\.\d+\.\d+/.test(update.productVersion) ? update.productVersion.replace(/(\d+\.\d+\.\d+)\.\d+(\-\w+)?/, '$1$2') : update.productVersion.replace(/(\d+\.\d+\.)0+(\d+)(\-\w+)?/, '$1$2$3')
+ const currentVersion = this.productService.version.replace(/(\d+\.\d+\.)0+(\d+)(\-\w+)?/, '$1$2$3') + const currentVersion = this.productService.version.replace(/(\d+\.\d+\.)0+(\d+)(\-\w+)?/, '$1$2$3')
@@ -253,26 +253,56 @@ index da4c875..fa634dc 100644
+ } + }
+ +
if (updateType === UpdateType.Archive) { if (updateType === UpdateType.Archive) {
@@ -271,3 +294,2 @@ export class Win32UpdateService extends AbstractUpdateService implements IRelaun @@ -295,3 +317,2 @@ export class Win32UpdateService extends AbstractUpdateService implements IRelaun
.then(undefined, err => { .then(undefined, err => {
- this.telemetryService.publicLog2<{ messageHash: string }, UpdateErrorClassification>('update:error', { messageHash: String(hash(String(err))) }); - this.telemetryService.publicLog2<{ messageHash: string }, UpdateErrorClassification>('update:error', { messageHash: String(hash(String(err))) });
this.logService.error(err); this.logService.error(err);
@@ -494,6 +516,14 @@ export class Win32UpdateService extends AbstractUpdateService implements IRelaun @@ -359,20 +380,31 @@ export class Win32UpdateService extends AbstractUpdateService implements IRelaun
} else { await pfs.Promises.writeFile(this.availableUpdate.updateFilePath, 'flag');
- spawn(this.availableUpdate.packagePath, ['/silent', '/log', '/mergetasks=runcode,!desktopicon,!quicklaunchicon'], { - const child = spawn(this.availableUpdate.packagePath,
- detached: true, - [
- stdio: ['ignore', 'ignore', 'ignore'] - '/verysilent',
- }); - '/log',
+ const type = getUpdateType(); - `/update="${this.availableUpdate.updateFilePath}"`,
+ if (type == UpdateType.WindowsInstaller) { - `/progress="${progressFilePath}"`,
+ spawn('msiexec.exe', ['/i', this.availableUpdate.packagePath], { - `/sessionend="${sessionEndFlagPath}"`,
- `/cancel="${cancelFilePath}"`,
- '/nocloseapplications',
- '/mergetasks=runcode,!desktopicon,!quicklaunchicon'
- ],
- {
+
+ let child: ChildProcess
+
+ const type = getUpdateType();
+ if (type == UpdateType.WindowsInstaller) {
+ child = spawn('msiexec.exe', ['/i', this.availableUpdate.packagePath], {
detached: true,
- stdio: ['ignore', 'ignore', 'ignore'],
- windowsVerbatimArguments: true,
- env: { ...process.env, __COMPAT_LAYER: 'RunAsInvoker' }
- }
- );
+ stdio: ['ignore', 'ignore', 'ignore']
+ });
+ } else {
+ child = spawn(this.availableUpdate.packagePath,
+ [
+ '/verysilent',
+ '/log',
+ `/update="${this.availableUpdate.updateFilePath}"`,
+ `/progress="${progressFilePath}"`,
+ `/sessionend="${sessionEndFlagPath}"`,
+ `/cancel="${cancelFilePath}"`,
+ '/nocloseapplications',
+ '/mergetasks=runcode,!desktopicon,!quicklaunchicon'
+ ],
+ {
+ detached: true, + detached: true,
+ stdio: ['ignore', 'ignore', 'ignore'] + stdio: ['ignore', 'ignore', 'ignore'],
+ }); + windowsVerbatimArguments: true,
+ } else { + env: { ...process.env, __COMPAT_LAYER: 'RunAsInvoker' }
+ spawn(this.availableUpdate.packagePath, ['/silent', '/log', '/mergetasks=runcode,!desktopicon,!quicklaunchicon'], { + }
+ detached: true, + );
+ stdio: ['ignore', 'ignore', 'ignore'] + }
+ });
+ }
}

2
upstream/insider.json
View File

@@ -1,4 +1,4 @@
{ {
"tag": "1.110.0", "tag": "1.110.0",
"commit": "547a36e89fec78f3c1a33302cdd7d8d8143cb09e" "commit": "37f39645643438347f1b5077abdaa96e7297fa7c"
} }