mirror of
https://github.com/VSCodium/vscodium.git
synced 2026-04-16 05:38:54 +10:00
Compare commits
14 Commits
1.104.3666
...
1.105.0680
| Author | SHA1 | Date | |
|---|---|---|---|
|
60b7a4640e | ||
|
|
f81d3d53ad | ||
|
|
a95e1ff14f | ||
|
|
36270ef9c3 | ||
|
|
c0ac4bd72e | ||
|
|
f60f14d085 | ||
|
|
a9167d21e2 | ||
|
|
e1f7642bcb | ||
|
|
94a6ad5495 | ||
|
|
73046b84aa | ||
|
|
578df58363 | ||
|
|
20382726b4 | ||
|
|
b943cab988 | ||
|
|
a69d10fa91 |
8
.github/workflows/insider-spearhead.yml
vendored
8
.github/workflows/insider-spearhead.yml
vendored
@@ -28,6 +28,7 @@ jobs:
|
||||
GH_REPO_PATH: ${{ github.repository }}
|
||||
ORG_NAME: ${{ github.repository_owner }}
|
||||
OS_NAME: osx
|
||||
SOURCEMAPS_REPOSITORY: ${{ github.repository_owner }}/sourcemaps
|
||||
VERSIONS_REPOSITORY: ${{ github.repository_owner }}/versions
|
||||
VSCODE_ARCH: arm64
|
||||
VSCODE_LATEST: ${{ github.event.inputs.dont_update == 'true' && 'no' || 'yes' }}
|
||||
@@ -76,6 +77,13 @@ jobs:
|
||||
run: ./prepare_src.sh
|
||||
if: env.SHOULD_BUILD == 'yes'
|
||||
|
||||
- name: Upload sourcemaps
|
||||
env:
|
||||
GITHUB_TOKEN: ${{ secrets.STRONGER_GITHUB_TOKEN }}
|
||||
GITHUB_USERNAME: ${{ github.repository_owner }}
|
||||
run: ./upload_sourcemaps.sh
|
||||
if: env.SHOULD_BUILD == 'yes'
|
||||
|
||||
- name: Release source
|
||||
env:
|
||||
GITHUB_TOKEN: ${{ secrets.STRONGER_GITHUB_TOKEN }}
|
||||
|
||||
7
.github/workflows/stable-spearhead.yml
vendored
7
.github/workflows/stable-spearhead.yml
vendored
@@ -71,6 +71,13 @@ jobs:
|
||||
run: ./prepare_src.sh
|
||||
if: env.SHOULD_BUILD == 'yes'
|
||||
|
||||
- name: Upload sourcemaps
|
||||
env:
|
||||
GITHUB_TOKEN: ${{ secrets.STRONGER_GITHUB_TOKEN }}
|
||||
GITHUB_USERNAME: ${{ github.repository_owner }}
|
||||
run: ./upload_sourcemaps.sh
|
||||
if: env.SHOULD_BUILD == 'yes'
|
||||
|
||||
- name: Release source
|
||||
env:
|
||||
GITHUB_TOKEN: ${{ secrets.STRONGER_GITHUB_TOKEN }}
|
||||
|
||||
1
.gitignore
vendored
1
.gitignore
vendored
@@ -14,5 +14,6 @@ build/linux/appimage/VSCodium
|
||||
build/windows/msi/releasedir
|
||||
build/windows/msi/Files*.wxs
|
||||
build/windows/msi/Files*.wixobj
|
||||
sourcemaps/
|
||||
stores/snapcraft/insider/*.snap
|
||||
stores/snapcraft/stable/*.snap
|
||||
|
||||
@@ -64,7 +64,7 @@ fi
|
||||
|
||||
for ARCH in alpine linux osx windows; do
|
||||
for FILE in "../patches/${ARCH}/"*.patch; do
|
||||
if [[ "${ARCH}" == "linux" && "${FILE}" == *"/arch-"* ]] || [[ "${ARCH}" == "windows" && "${FILE}" == *"/cli"* ]]; then
|
||||
if [[ "${ARCH}" == "linux" && "${FILE}" == *"/arch-"* ]] || [[ "${ARCH}" == "linux" && "${FILE}" == *"/fix-dependencies.patch" ]] || [[ "${ARCH}" == "windows" && "${FILE}" == *"/cli"* ]]; then
|
||||
echo "skip ${FILE}"
|
||||
else
|
||||
check_file "${FILE}"
|
||||
@@ -72,6 +72,8 @@ for ARCH in alpine linux osx windows; do
|
||||
done
|
||||
|
||||
if [[ "${ARCH}" == "linux" ]]; then
|
||||
check_file "../patches/optional-tree-sitter.patch" "../patches/linux/fix-dependencies.patch"
|
||||
|
||||
check_file "../patches/cli.patch" "../patches/linux/arch-0-support.patch"
|
||||
check_file "../patches/cli.patch" "../patches/linux/arch-0-support.patch" "../patches/linux/arch-1-ppc64le.patch"
|
||||
check_file "../patches/cli.patch" "../patches/linux/arch-0-support.patch" "../patches/linux/arch-1-ppc64le.patch" "../patches/linux/arch-2-riscv64.patch"
|
||||
|
||||
@@ -73,37 +73,37 @@ index be7eea1..0737bab 100644
|
||||
+const bumpEngineForImplicitActivationEvents = l10n.t("This activation event can be removed for extensions targeting engine version ^1.75 as !!APP_NAME!! will generate these automatically from your package.json contribution declarations.");
|
||||
const starActivation = l10n.t("Using '*' activation is usually a bad idea as it impacts performance.");
|
||||
diff --git a/extensions/git/package.nls.json b/extensions/git/package.nls.json
|
||||
index 8e2d58e..01218da 100644
|
||||
index ae4159e..93d74ae 100644
|
||||
--- a/extensions/git/package.nls.json
|
||||
+++ b/extensions/git/package.nls.json
|
||||
@@ -236,3 +236,3 @@
|
||||
@@ -237,3 +237,3 @@
|
||||
"{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 !!APP_NAME!!",
|
||||
"Please make sure there is no space between the right bracket and left parenthesis: ]( this is an internal syntax for links"
|
||||
@@ -264,4 +264,4 @@
|
||||
@@ -265,4 +265,4 @@
|
||||
"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.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.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.",
|
||||
@@ -333,3 +333,3 @@
|
||||
@@ -334,3 +334,3 @@
|
||||
"{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 !!APP_NAME!!",
|
||||
"Please make sure there is no space between the right bracket and left parenthesis: ]( this is an internal syntax for links"
|
||||
@@ -343,3 +343,3 @@
|
||||
@@ -344,3 +344,3 @@
|
||||
"{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 !!APP_NAME!!",
|
||||
"Please make sure there is no space between the right bracket and left parenthesis: ]( this is an internal syntax for links"
|
||||
@@ -353,3 +353,3 @@
|
||||
@@ -354,3 +354,3 @@
|
||||
"{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 !!APP_NAME!!",
|
||||
"Please make sure there is no space between the right bracket and left parenthesis: ]( this is an internal syntax for links"
|
||||
@@ -365,6 +365,6 @@
|
||||
@@ -366,6 +366,6 @@
|
||||
"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 !!APP_NAME!! [read our docs](https://aka.ms/vscode-scm).",
|
||||
@@ -112,7 +112,7 @@ index 8e2d58e..01218da 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 !!APP_NAME!!",
|
||||
"Please make sure there is no space between the right bracket and left parenthesis: ]( this is an internal syntax for links"
|
||||
@@ -373,6 +373,6 @@
|
||||
@@ -374,6 +374,6 @@
|
||||
"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 !!APP_NAME!! [read our docs](https://aka.ms/vscode-scm).",
|
||||
@@ -121,7 +121,7 @@ index 8e2d58e..01218da 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 !!APP_NAME!!",
|
||||
"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 @@
|
||||
@@ -382,6 +382,6 @@
|
||||
"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 !!APP_NAME!! [read our docs](https://aka.ms/vscode-scm).",
|
||||
@@ -130,7 +130,7 @@ index 8e2d58e..01218da 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 !!APP_NAME!!",
|
||||
"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 @@
|
||||
@@ -390,6 +390,6 @@
|
||||
"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 !!APP_NAME!! [read our docs](https://aka.ms/vscode-scm).",
|
||||
@@ -139,7 +139,7 @@ index 8e2d58e..01218da 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 !!APP_NAME!!",
|
||||
"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 @@
|
||||
@@ -398,6 +398,6 @@
|
||||
"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 !!APP_NAME!! [read our docs](https://aka.ms/vscode-scm).",
|
||||
@@ -148,27 +148,27 @@ index 8e2d58e..01218da 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 !!APP_NAME!!",
|
||||
"Please make sure there is no space between the right bracket and left parenthesis: ]( this is an internal syntax for links"
|
||||
@@ -415,3 +415,3 @@
|
||||
@@ -416,3 +416,3 @@
|
||||
"{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 !!APP_NAME!!",
|
||||
"Please make sure there is no space between the right bracket and left parenthesis: ]( this is an internal syntax for links"
|
||||
@@ -424,3 +424,3 @@
|
||||
@@ -425,3 +425,3 @@
|
||||
"{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 !!APP_NAME!!",
|
||||
"Please make sure there is no space between the right bracket and left parenthesis: ]( this is an internal syntax for links"
|
||||
@@ -432,3 +432,3 @@
|
||||
@@ -433,3 +433,3 @@
|
||||
"{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 !!APP_NAME!!",
|
||||
"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 @@
|
||||
@@ -441,3 +441,3 @@
|
||||
"{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 !!APP_NAME!!",
|
||||
"Please make sure there is no space between the right bracket and left parenthesis: ]( this is an internal syntax for links"
|
||||
@@ -445,6 +445,6 @@
|
||||
@@ -446,6 +446,6 @@
|
||||
"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 !!APP_NAME!! [read our docs](https://aka.ms/vscode-scm).",
|
||||
@@ -177,7 +177,7 @@ index 8e2d58e..01218da 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 !!APP_NAME!!",
|
||||
"Please make sure there is no space between the right bracket and left parenthesis: ]( this is an internal syntax for links"
|
||||
@@ -453,6 +453,6 @@
|
||||
@@ -454,6 +454,6 @@
|
||||
"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 !!APP_NAME!! [read our docs](https://aka.ms/vscode-scm).",
|
||||
@@ -186,12 +186,12 @@ index 8e2d58e..01218da 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 !!APP_NAME!!",
|
||||
"Please make sure there is no space between the right bracket and left parenthesis: ]( this is an internal syntax for links"
|
||||
@@ -464,3 +464,3 @@
|
||||
@@ -465,3 +465,3 @@
|
||||
"{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 !!APP_NAME!!",
|
||||
"Please make sure there is no space between the right bracket and left parenthesis: ]( this is an internal syntax for links"
|
||||
@@ -468,3 +468,3 @@
|
||||
@@ -469,3 +469,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 !!APP_NAME!! [read our docs](https://aka.ms/vscode-scm)."
|
||||
@@ -275,7 +275,7 @@ index e82030e..ac999f6 100644
|
||||
+ "displayName": "Jake support for !!APP_NAME!!",
|
||||
"jake.taskDefinition.type.description": "The Jake task to customize.",
|
||||
diff --git a/extensions/json-language-features/package.nls.json b/extensions/json-language-features/package.nls.json
|
||||
index af6c9d8..36e64cf 100644
|
||||
index abc07c9..2a6de09 100644
|
||||
--- a/extensions/json-language-features/package.nls.json
|
||||
+++ b/extensions/json-language-features/package.nls.json
|
||||
@@ -11,3 +11,3 @@
|
||||
@@ -433,26 +433,26 @@ index 9905fd5..62c2e3c 100644
|
||||
+ vscode.l10n.t("Please open a folder in !!APP_NAME!! to use a TypeScript or JavaScript project"));
|
||||
return;
|
||||
diff --git a/extensions/typescript-language-features/src/typescriptServiceClient.ts b/extensions/typescript-language-features/src/typescriptServiceClient.ts
|
||||
index 4201d6d..ded6803 100644
|
||||
index 57395ce..c2b706a 100644
|
||||
--- a/extensions/typescript-language-features/src/typescriptServiceClient.ts
|
||||
+++ b/extensions/typescript-language-features/src/typescriptServiceClient.ts
|
||||
@@ -653,3 +653,3 @@ export default class TypeScriptServiceClient extends Disposable implements IType
|
||||
@@ -656,3 +656,3 @@ export default class TypeScriptServiceClient extends Disposable implements IType
|
||||
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 !!APP_NAME!!.", pluginExtensionList));
|
||||
} else {
|
||||
@@ -674,3 +674,3 @@ export default class TypeScriptServiceClient extends Disposable implements IType
|
||||
@@ -677,3 +677,3 @@ export default class TypeScriptServiceClient extends Disposable implements IType
|
||||
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 !!APP_NAME!!.", pluginExtensionList));
|
||||
} else {
|
||||
@@ -688,3 +688,3 @@ export default class TypeScriptServiceClient extends Disposable implements IType
|
||||
@@ -691,3 +691,3 @@ export default class TypeScriptServiceClient extends Disposable implements IType
|
||||
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 !!APP_NAME!!.", pluginExtensionList));
|
||||
} else {
|
||||
diff --git a/extensions/vscode-api-tests/package.json b/extensions/vscode-api-tests/package.json
|
||||
index 28005be..306c04a 100644
|
||||
index 250ec7a..74bdbdf 100644
|
||||
--- a/extensions/vscode-api-tests/package.json
|
||||
+++ b/extensions/vscode-api-tests/package.json
|
||||
@@ -2,3 +2,3 @@
|
||||
@@ -603,7 +603,7 @@ index 0b2e320..a6a37d1 100644
|
||||
+ throw new Error(nls.localize('restartCode', "Please restart !!APP_NAME!! before reinstalling {0}.", this.manifest.displayName || this.manifest.name));
|
||||
}
|
||||
diff --git a/src/vs/platform/extensions/common/extensionValidator.ts b/src/vs/platform/extensions/common/extensionValidator.ts
|
||||
index 87a9288..dcbbf0a 100644
|
||||
index 0683f68..7e27873 100644
|
||||
--- a/src/vs/platform/extensions/common/extensionValidator.ts
|
||||
+++ b/src/vs/platform/extensions/common/extensionValidator.ts
|
||||
@@ -374,5 +374,5 @@ export function areApiProposalsCompatible(apiProposals: string[], arg1?: any): b
|
||||
@@ -624,7 +624,7 @@ index ca6c82b..56fab2c 100644
|
||||
+const TERMINAL_TITLE = nls.localize('console.title', "!!APP_NAME!! Console");
|
||||
|
||||
diff --git a/src/vs/platform/terminal/common/terminalPlatformConfiguration.ts b/src/vs/platform/terminal/common/terminalPlatformConfiguration.ts
|
||||
index 7d8d78b..d39dad4 100644
|
||||
index bbd4bee..ba81c21 100644
|
||||
--- a/src/vs/platform/terminal/common/terminalPlatformConfiguration.ts
|
||||
+++ b/src/vs/platform/terminal/common/terminalPlatformConfiguration.ts
|
||||
@@ -338,3 +338,3 @@ const terminalPlatformConfiguration: IConfigurationNode = {
|
||||
@@ -671,16 +671,16 @@ index 0535ddd..2478997 100644
|
||||
+ console.error('Unable to connect to !!APP_NAME!! server: ' + message);
|
||||
console.error(err);
|
||||
diff --git a/src/vs/workbench/api/browser/mainThreadAuthentication.ts b/src/vs/workbench/api/browser/mainThreadAuthentication.ts
|
||||
index 902230b..8fa914c 100644
|
||||
index f15906e..1d63292 100644
|
||||
--- a/src/vs/workbench/api/browser/mainThreadAuthentication.ts
|
||||
+++ b/src/vs/workbench/api/browser/mainThreadAuthentication.ts
|
||||
@@ -490,3 +490,3 @@ export class MainThreadAuthentication extends Disposable implements MainThreadAu
|
||||
@@ -498,3 +498,3 @@ export class MainThreadAuthentication extends Disposable implements MainThreadAu
|
||||
owner: 'TylerLeonhardt';
|
||||
- comment: 'Used to see which extensions are using the VSCode client id override';
|
||||
+ comment: 'Used to see which extensions are using the !!APP_NAME!! client id override';
|
||||
extensionId: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'The extension id.' };
|
||||
diff --git a/src/vs/workbench/api/browser/viewsExtensionPoint.ts b/src/vs/workbench/api/browser/viewsExtensionPoint.ts
|
||||
index 7695758..735d45f 100644
|
||||
index 0674b8f..7bf3dd4 100644
|
||||
--- a/src/vs/workbench/api/browser/viewsExtensionPoint.ts
|
||||
+++ b/src/vs/workbench/api/browser/viewsExtensionPoint.ts
|
||||
@@ -43,3 +43,3 @@ const viewsContainerSchema: IJSONSchema = {
|
||||
@@ -736,7 +736,7 @@ index 0ebe271..20974b2 100644
|
||||
+ throw new Error('Unable to create the !!APP_NAME!! workbench more than once.');
|
||||
} else {
|
||||
diff --git a/src/vs/workbench/browser/workbench.contribution.ts b/src/vs/workbench/browser/workbench.contribution.ts
|
||||
index 06911cb..9498377 100644
|
||||
index d09ab3f..24e5f8d 100644
|
||||
--- a/src/vs/workbench/browser/workbench.contribution.ts
|
||||
+++ b/src/vs/workbench/browser/workbench.contribution.ts
|
||||
@@ -712,3 +712,3 @@ const registry = Registry.as<IConfigurationRegistry>(ConfigurationExtensions.Con
|
||||
@@ -745,15 +745,15 @@ index 06911cb..9498377 100644
|
||||
+ localize('appName', "`${appName}`: e.g. !!APP_NAME!!."),
|
||||
localize('remoteName', "`${remoteName}`: e.g. SSH"),
|
||||
diff --git a/src/vs/workbench/contrib/chat/browser/chatSetup.ts b/src/vs/workbench/contrib/chat/browser/chatSetup.ts
|
||||
index a19380c..1b08415 100644
|
||||
index 4325d48..d4fd731 100644
|
||||
--- a/src/vs/workbench/contrib/chat/browser/chatSetup.ts
|
||||
+++ b/src/vs/workbench/contrib/chat/browser/chatSetup.ts
|
||||
@@ -147,3 +147,3 @@ class SetupAgent extends Disposable implements IChatAgentImplementation {
|
||||
@@ -154,3 +154,3 @@ class SetupAgent extends Disposable implements IChatAgentImplementation {
|
||||
// Register VSCode agent
|
||||
- const { disposable: vscodeDisposable } = SetupAgent.doRegisterAgent(instantiationService, chatAgentService, 'setup.vscode', 'vscode', false, localize2('vscodeAgentDescription', "Ask questions about VS Code").value, ChatAgentLocation.Panel, undefined, context, controller);
|
||||
+ const { disposable: vscodeDisposable } = SetupAgent.doRegisterAgent(instantiationService, chatAgentService, 'setup.vscode', 'vscode', false, localize2('vscodeAgentDescription', "Ask questions about !!APP_NAME!!").value, ChatAgentLocation.Panel, undefined, context, controller);
|
||||
- const { disposable: vscodeDisposable } = SetupAgent.doRegisterAgent(instantiationService, chatAgentService, 'setup.vscode', 'vscode', false, localize2('vscodeAgentDescription', "Ask questions about VS Code").value, ChatAgentLocation.Chat, undefined, context, controller);
|
||||
+ const { disposable: vscodeDisposable } = SetupAgent.doRegisterAgent(instantiationService, chatAgentService, 'setup.vscode', 'vscode', false, localize2('vscodeAgentDescription', "Ask questions about !!APP_NAME!!").value, ChatAgentLocation.Chat, undefined, context, controller);
|
||||
disposables.add(vscodeDisposable);
|
||||
@@ -164,4 +164,4 @@ class SetupAgent extends Disposable implements IChatAgentImplementation {
|
||||
@@ -171,4 +171,4 @@ class SetupAgent extends Disposable implements IChatAgentImplementation {
|
||||
displayName: localize('setupToolDisplayName', "New Workspace"),
|
||||
- modelDescription: localize('setupToolsDescription', "Scaffold a new workspace in VS Code"),
|
||||
- userDescription: localize('setupToolsDescription', "Scaffold a new workspace in VS Code"),
|
||||
@@ -801,7 +801,7 @@ index 1bc0b4b..89330c0 100644
|
||||
+ : localize('InstallVSIXAction.successReload', "Completed installing extension. Please reload VSCodium to enable it."),
|
||||
[{
|
||||
diff --git a/src/vs/workbench/contrib/extensions/browser/extensionsActions.ts b/src/vs/workbench/contrib/extensions/browser/extensionsActions.ts
|
||||
index 27b428a..ab75e58 100644
|
||||
index a84f2db..9df8237 100644
|
||||
--- a/src/vs/workbench/contrib/extensions/browser/extensionsActions.ts
|
||||
+++ b/src/vs/workbench/contrib/extensions/browser/extensionsActions.ts
|
||||
@@ -109,3 +109,3 @@ export class PromptExtensionInstallFailureAction extends Action {
|
||||
@@ -820,7 +820,7 @@ index 27b428a..ab75e58 100644
|
||||
+ alert(localize('uninstallExtensionComplete', "Please reload !!APP_NAME!! to complete the uninstallation of the extension {0}.", this.extension.displayName));
|
||||
} catch (error) {
|
||||
@@ -2599,3 +2599,3 @@ export class ExtensionStatusAction extends ExtensionAction {
|
||||
const link = `[${localize('settings', "settings")}](${URI.parse(`command:workbench.action.openSettings?${encodeURIComponent(JSON.stringify([this.extension.deprecationInfo.settings.map(setting => `@id:${setting}`).join(' ')]))}`)})`;
|
||||
const link = `[${localize('settings', "settings")}](${createCommandUri('workbench.action.openSettings', this.extension.deprecationInfo.settings.map(setting => `@id:${setting}`).join(' '))}})`;
|
||||
- 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 VS Code. 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 {
|
||||
@@ -862,7 +862,7 @@ index f54ddfe..946de6b 100644
|
||||
+ enumDescriptions: [nls.localize('externalUriOpeners.defaultId', "Open using !!APP_NAME!!'s standard opener.")],
|
||||
},
|
||||
diff --git a/src/vs/workbench/contrib/localization/common/localization.contribution.ts b/src/vs/workbench/contrib/localization/common/localization.contribution.ts
|
||||
index b89d74b..2a06ffb 100644
|
||||
index bd73995..61b7d12 100644
|
||||
--- a/src/vs/workbench/contrib/localization/common/localization.contribution.ts
|
||||
+++ b/src/vs/workbench/contrib/localization/common/localization.contribution.ts
|
||||
@@ -58,5 +58,5 @@ export class BaseLocalizationWorkbenchContribution extends Disposable implements
|
||||
@@ -894,10 +894,10 @@ index b533feb..112d695 100644
|
||||
+ `// ${nls.localize('doc', 'Open !!APP_NAME!! and run "Developer: Inspect Key Mappings (JSON)" from Command Palette.')}`,
|
||||
``,
|
||||
diff --git a/src/vs/workbench/contrib/tasks/browser/abstractTaskService.ts b/src/vs/workbench/contrib/tasks/browser/abstractTaskService.ts
|
||||
index 631d969..22432b6 100644
|
||||
index 916f7a3..973580f 100644
|
||||
--- a/src/vs/workbench/contrib/tasks/browser/abstractTaskService.ts
|
||||
+++ b/src/vs/workbench/contrib/tasks/browser/abstractTaskService.ts
|
||||
@@ -3341,3 +3341,3 @@ export abstract class AbstractTaskService extends Disposable implements ITaskSer
|
||||
@@ -3447,3 +3447,3 @@ export abstract class AbstractTaskService extends Disposable implements ITaskSer
|
||||
if (response.code && response.code === TerminateResponseCode.ProcessNotFound) {
|
||||
- this._notificationService.error(nls.localize('TerminateAction.noProcess', 'The launched process doesn\'t exist anymore. If the task spawned background tasks exiting VS Code might result in orphaned processes.'));
|
||||
+ this._notificationService.error(nls.localize('TerminateAction.noProcess', 'The launched process doesn\'t exist anymore. If the task spawned background tasks exiting !!APP_NAME!! might result in orphaned processes.'));
|
||||
@@ -917,10 +917,10 @@ index 9db6b8a..cecac9f 100644
|
||||
+ description: nls.localize('JsonSchema.promptOnClose', 'Whether the user is prompted when !!APP_NAME!! closes with a running background task.'),
|
||||
default: false
|
||||
diff --git a/src/vs/workbench/contrib/tasks/common/jsonSchema_v2.ts b/src/vs/workbench/contrib/tasks/common/jsonSchema_v2.ts
|
||||
index e698eb9..b2a6e63 100644
|
||||
index d917ab2..bb39d83 100644
|
||||
--- a/src/vs/workbench/contrib/tasks/common/jsonSchema_v2.ts
|
||||
+++ b/src/vs/workbench/contrib/tasks/common/jsonSchema_v2.ts
|
||||
@@ -424,3 +424,3 @@ const taskConfiguration: IJSONSchema = {
|
||||
@@ -429,3 +429,3 @@ const taskConfiguration: IJSONSchema = {
|
||||
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 !!APP_NAME!! closes with a running task.'),
|
||||
@@ -935,7 +935,7 @@ index 50bfba8..a2a82bc 100644
|
||||
+ this._notificationService.prompt(Severity.Warning, nls.localize('terminal.monospaceOnly', "The terminal only supports monospace fonts. Be sure to restart !!APP_NAME!! if this is a newly installed font."), choices);
|
||||
}
|
||||
diff --git a/src/vs/workbench/contrib/terminal/common/terminalConfiguration.ts b/src/vs/workbench/contrib/terminal/common/terminalConfiguration.ts
|
||||
index aa2355b..ce4ca9e 100644
|
||||
index d92d577..eb868c2 100644
|
||||
--- a/src/vs/workbench/contrib/terminal/common/terminalConfiguration.ts
|
||||
+++ b/src/vs/workbench/contrib/terminal/common/terminalConfiguration.ts
|
||||
@@ -310,3 +310,3 @@ const terminalConfiguration: IStringDictionary<IConfigurationPropertySchema> = {
|
||||
@@ -1023,7 +1023,7 @@ index 393c8c3..9268a6c 100644
|
||||
+ content += `// By default, !!APP_NAME!! trusts "localhost".\n`;
|
||||
}
|
||||
diff --git a/src/vs/workbench/contrib/welcomeGettingStarted/browser/gettingStarted.contribution.ts b/src/vs/workbench/contrib/welcomeGettingStarted/browser/gettingStarted.contribution.ts
|
||||
index 57b91bd..89c2b68 100644
|
||||
index 7df25f0..ef9c492 100644
|
||||
--- a/src/vs/workbench/contrib/welcomeGettingStarted/browser/gettingStarted.contribution.ts
|
||||
+++ b/src/vs/workbench/contrib/welcomeGettingStarted/browser/gettingStarted.contribution.ts
|
||||
@@ -49,3 +49,3 @@ registerAction2(class extends Action2 {
|
||||
@@ -1031,13 +1031,13 @@ index 57b91bd..89c2b68 100644
|
||||
- description: localize2('minWelcomeDescription', 'Opens a Walkthrough to help you get started in VS Code.')
|
||||
+ description: localize2('minWelcomeDescription', 'Opens a Walkthrough to help you get started in !!APP_NAME!!.')
|
||||
}
|
||||
@@ -311,3 +311,3 @@ configurationRegistry.registerConfiguration({
|
||||
@@ -316,3 +316,3 @@ configurationRegistry.registerConfiguration({
|
||||
localize({ comment: ['This is the description for a setting. Values surrounded by single quotes are not to be translated.'], key: 'workbench.startupEditor.none' }, "Start without an editor."),
|
||||
- localize({ comment: ['This is the description for a setting. Values surrounded by single quotes are not to be translated.'], key: 'workbench.startupEditor.welcomePage' }, "Open the Welcome page, with content to aid in getting started with VS Code and extensions."),
|
||||
+ localize({ comment: ['This is the description for a setting. Values surrounded by single quotes are not to be translated.'], key: 'workbench.startupEditor.welcomePage' }, "Open the Welcome page, with content to aid in getting started with !!APP_NAME!! and extensions."),
|
||||
localize({ comment: ['This is the description for a setting. Values surrounded by single quotes are not to be translated.'], key: 'workbench.startupEditor.readme' }, "Open the README when opening a folder that contains one, fallback to 'welcomePage' otherwise. Note: This is only observed as a global configuration, it will be ignored if set in a workspace or folder configuration."),
|
||||
diff --git a/src/vs/workbench/contrib/welcomeGettingStarted/browser/gettingStartedExtensionPoint.ts b/src/vs/workbench/contrib/welcomeGettingStarted/browser/gettingStartedExtensionPoint.ts
|
||||
index 3f1c098..26bf670 100644
|
||||
index 297598e..1fc5b45 100644
|
||||
--- a/src/vs/workbench/contrib/welcomeGettingStarted/browser/gettingStartedExtensionPoint.ts
|
||||
+++ b/src/vs/workbench/contrib/welcomeGettingStarted/browser/gettingStartedExtensionPoint.ts
|
||||
@@ -161,3 +161,3 @@ export const walkthroughsExtensionPoint = ExtensionsRegistry.registerExtensionPo
|
||||
@@ -1046,10 +1046,10 @@ index 3f1c098..26bf670 100644
|
||||
+ description: localize('walkthroughs.steps.completionEvents.onCommand', 'Check off step when a given command is executed anywhere in !!APP_NAME!!.'),
|
||||
body: 'onCommand:${1:commandId}'
|
||||
diff --git a/src/vs/workbench/contrib/welcomeGettingStarted/common/gettingStartedContent.ts b/src/vs/workbench/contrib/welcomeGettingStarted/common/gettingStartedContent.ts
|
||||
index 3826aa8..b2803d8 100644
|
||||
index 2c462d5..5637419 100644
|
||||
--- a/src/vs/workbench/contrib/welcomeGettingStarted/common/gettingStartedContent.ts
|
||||
+++ b/src/vs/workbench/contrib/welcomeGettingStarted/common/gettingStartedContent.ts
|
||||
@@ -209,13 +209,2 @@ export const startEntries: GettingStartedStartEntryContent = [
|
||||
@@ -211,13 +211,2 @@ export const startEntries: GettingStartedStartEntryContent = [
|
||||
},
|
||||
- {
|
||||
- id: 'topLevelNewWorkspaceChat',
|
||||
@@ -1063,17 +1063,19 @@ index 3826aa8..b2803d8 100644
|
||||
- }
|
||||
- },
|
||||
];
|
||||
@@ -224,24 +213,2 @@ const Button = (title: string, href: string) => `[${title}](${href})`;
|
||||
@@ -226,26 +215,2 @@ const Button = (title: string, href: string) => `[${title}](${href})`;
|
||||
|
||||
-const CopilotStepTitle = localize('gettingStarted.copilotSetup.title', "Use AI features with Copilot for free");
|
||||
-const CopilotDescription = localize({ key: 'gettingStarted.copilotSetup.description', comment: ['{Locked="["}', '{Locked="]({0})"}'] }, "You can use [Copilot]({0}) to generate code across multiple files, fix errors, ask questions about your code and much more using natural language.", defaultChat.documentationUrl ?? '');
|
||||
-const CopilotSignedOutButton = Button(localize('setupCopilotButton.signIn', "Set up Copilot"), `command:workbench.action.chat.triggerSetup`);
|
||||
-const CopilotDescription = localize({ key: 'gettingStarted.copilotSetup.description', comment: ['{Locked="["}', '{Locked="]({0})"}'] }, "You can use [Copilot]({0}) to generate code across multiple files, fix errors, ask questions about your code, and much more using natural language.", defaultChat.documentationUrl ?? '');
|
||||
-const CopilotTermsString = localize({ key: 'gettingStarted.copilotSetup.terms', comment: ['{Locked="]({2})"}', '{Locked="]({3})"}'] }, "By continuing with {0} Copilot, you agree to {1}'s [Terms]({2}) and [Privacy Statement]({3})", defaultChat.provider.default.name, defaultChat.provider.default.name, defaultChat.termsStatementUrl, defaultChat.privacyStatementUrl);
|
||||
-const CopilotAnonymousButton = Button(localize('setupCopilotButton.setup', "Set up Copilot"), `command:workbench.action.chat.triggerSetupAnonymousWithoutDialog`);
|
||||
-const CopilotSignedOutButton = Button(localize('setupCopilotButton.setup', "Set up Copilot"), `command:workbench.action.chat.triggerSetup`);
|
||||
-const CopilotSignedInButton = Button(localize('setupCopilotButton.setup', "Set up Copilot"), `command:workbench.action.chat.triggerSetup`);
|
||||
-const CopilotCompleteButton = Button(localize('setupCopilotButton.chatWithCopilot', "Chat with Copilot"), 'command:workbench.action.chat.open');
|
||||
-
|
||||
-function createCopilotSetupStep(id: string, button: string, when: string, includeTerms: boolean): BuiltinGettingStartedStep {
|
||||
- const description = includeTerms ?
|
||||
- `${CopilotDescription}\n\n${button}` :
|
||||
- `${CopilotDescription}\n${CopilotTermsString}\n${button}` :
|
||||
- `${CopilotDescription}\n${button}`;
|
||||
-
|
||||
- return {
|
||||
@@ -1088,40 +1090,19 @@ index 3826aa8..b2803d8 100644
|
||||
-}
|
||||
-
|
||||
export const walkthroughs: GettingStartedWalkthroughContent = [
|
||||
@@ -249,3 +216,3 @@ export const walkthroughs: GettingStartedWalkthroughContent = [
|
||||
id: 'Setup',
|
||||
- title: localize('gettingStarted.setup.title', "Get started with VS Code"),
|
||||
+ title: localize('gettingStarted.setup.title', "Get started with !!APP_NAME!!"),
|
||||
description: localize('gettingStarted.setup.description', "Customize your editor, learn the basics, and start coding"),
|
||||
@@ -254,3 +221,3 @@ export const walkthroughs: GettingStartedWalkthroughContent = [
|
||||
when: '!isWeb',
|
||||
- walkthroughPageTitle: localize('gettingStarted.setup.walkthroughPageTitle', 'Setup VS Code'),
|
||||
+ walkthroughPageTitle: localize('gettingStarted.setup.walkthroughPageTitle', 'Setup !!APP_NAME!!'),
|
||||
next: 'Beginner',
|
||||
@@ -259,5 +226,2 @@ export const walkthroughs: GettingStartedWalkthroughContent = [
|
||||
@@ -263,6 +228,2 @@ export const walkthroughs: GettingStartedWalkthroughContent = [
|
||||
steps: [
|
||||
- createCopilotSetupStep('CopilotSetupSignedOut', CopilotSignedOutButton, 'chatEntitlementSignedOut', true),
|
||||
- createCopilotSetupStep('CopilotSetupComplete', CopilotCompleteButton, 'chatSetupInstalled && !chatSetupDisabled && (chatPlanPro || chatPlanProPlus || chatPlanBusiness || chatPlanEnterprise || chatPlanFree)', false),
|
||||
- createCopilotSetupStep('CopilotSetupSignedIn', CopilotSignedInButton, '!chatEntitlementSignedOut && (!chatSetupInstalled || chatSetupDisabled || chatPlanCanSignUp)', true),
|
||||
- createCopilotSetupStep('CopilotSetupAnonymous', CopilotAnonymousButton, 'chatAnonymous && !chatSetupInstalled', true),
|
||||
- createCopilotSetupStep('CopilotSetupSignedOut', CopilotSignedOutButton, 'chatEntitlementSignedOut && !chatAnonymous', false),
|
||||
- createCopilotSetupStep('CopilotSetupComplete', CopilotCompleteButton, 'chatSetupInstalled && !chatSetupDisabled && (chatAnonymous || chatPlanPro || chatPlanProPlus || chatPlanBusiness || chatPlanEnterprise || chatPlanFree)', false),
|
||||
- createCopilotSetupStep('CopilotSetupSignedIn', CopilotSignedInButton, '!chatEntitlementSignedOut && (!chatSetupInstalled || chatSetupDisabled || chatPlanCanSignUp)', false),
|
||||
{
|
||||
@@ -275,4 +239,4 @@ export const walkthroughs: GettingStartedWalkthroughContent = [
|
||||
title: localize('gettingStarted.videoTutorial.title', "Watch video tutorials"),
|
||||
- description: localize('gettingStarted.videoTutorial.description.interpolated', "Watch the first in a series of short & practical video tutorials for VS Code's key features.\n{0}", Button(localize('watch', "Watch Tutorial"), 'https://aka.ms/vscode-getting-started-video')),
|
||||
- media: { type: 'svg', altText: 'VS Code Settings', path: 'learn.svg' },
|
||||
+ description: localize('gettingStarted.videoTutorial.description.interpolated', "Watch the first in a series of short & practical video tutorials for !!APP_NAME!!'s key features.\n{0}", Button(localize('watch', "Watch Tutorial"), 'https://aka.ms/vscode-getting-started-video')),
|
||||
+ media: { type: 'svg', altText: '!!APP_NAME!! Settings', path: 'learn.svg' },
|
||||
}
|
||||
@@ -284,3 +248,3 @@ export const walkthroughs: GettingStartedWalkthroughContent = [
|
||||
id: 'SetupWeb',
|
||||
- title: localize('gettingStarted.setupWeb.title', "Get Started with VS Code for the Web"),
|
||||
+ title: localize('gettingStarted.setupWeb.title', "Get Started with !!APP_NAME!! for the Web"),
|
||||
description: localize('gettingStarted.setupWeb.description', "Customize your editor, learn the basics, and start coding"),
|
||||
@@ -290,3 +254,3 @@ export const walkthroughs: GettingStartedWalkthroughContent = [
|
||||
@@ -295,3 +256,3 @@ export const walkthroughs: GettingStartedWalkthroughContent = [
|
||||
next: 'Beginner',
|
||||
- walkthroughPageTitle: localize('gettingStarted.setupWeb.walkthroughPageTitle', 'Setup VS Code Web'),
|
||||
+ walkthroughPageTitle: localize('gettingStarted.setupWeb.walkthroughPageTitle', 'Setup !!APP_NAME!! Web'),
|
||||
content: {
|
||||
@@ -316,6 +280,6 @@ export const walkthroughs: GettingStartedWalkthroughContent = [
|
||||
@@ -321,6 +282,6 @@ export const walkthroughs: GettingStartedWalkthroughContent = [
|
||||
title: localize('gettingStarted.extensions.title', "Code with extensions"),
|
||||
- description: localize('gettingStarted.extensionsWeb.description.interpolated', "Extensions are VS Code's power-ups. A growing number are becoming available in the web.\n{0}", Button(localize('browsePopularWeb', "Browse Popular Web Extensions"), 'command:workbench.extensions.action.showPopularExtensions')),
|
||||
+ description: localize('gettingStarted.extensionsWeb.description.interpolated', "Extensions are !!APP_NAME!!'s power-ups. A growing number are becoming available in the web.\n{0}", Button(localize('browsePopularWeb', "Browse Popular Web Extensions"), 'command:workbench.extensions.action.showPopularExtensions')),
|
||||
@@ -1130,7 +1111,7 @@ index 3826aa8..b2803d8 100644
|
||||
- type: 'svg', altText: 'VS Code extension marketplace with featured language extensions', path: 'extensions-web.svg'
|
||||
+ type: 'svg', altText: '!!APP_NAME!! extension marketplace with featured language extensions', path: 'extensions-web.svg'
|
||||
},
|
||||
@@ -331,12 +295,2 @@ export const walkthroughs: GettingStartedWalkthroughContent = [
|
||||
@@ -336,12 +297,2 @@ export const walkthroughs: GettingStartedWalkthroughContent = [
|
||||
},
|
||||
- {
|
||||
- id: 'settingsSyncWeb',
|
||||
@@ -1143,37 +1124,37 @@ index 3826aa8..b2803d8 100644
|
||||
- },
|
||||
- },
|
||||
{
|
||||
@@ -344,3 +298,3 @@ export const walkthroughs: GettingStartedWalkthroughContent = [
|
||||
@@ -349,3 +300,3 @@ export const walkthroughs: GettingStartedWalkthroughContent = [
|
||||
title: localize('gettingStarted.commandPalette.title', "Unlock productivity with the Command Palette "),
|
||||
- description: localize('gettingStarted.commandPalette.description.interpolated', "Run commands without reaching for your mouse to accomplish any task in VS Code.\n{0}", Button(localize('commandPalette', "Open Command Palette"), 'command:workbench.action.showCommands')),
|
||||
+ description: localize('gettingStarted.commandPalette.description.interpolated', "Run commands without reaching for your mouse to accomplish any task in !!APP_NAME!!.\n{0}", Button(localize('commandPalette', "Open Command Palette"), 'command:workbench.action.showCommands')),
|
||||
media: { type: 'svg', altText: 'Command Palette overlay for searching and executing commands.', path: 'commandPalette.svg' },
|
||||
@@ -350,3 +304,3 @@ export const walkthroughs: GettingStartedWalkthroughContent = [
|
||||
@@ -355,3 +306,3 @@ export const walkthroughs: GettingStartedWalkthroughContent = [
|
||||
title: localize('gettingStarted.setup.OpenFolder.title', "Open up your code"),
|
||||
- description: localize('gettingStarted.setup.OpenFolderWeb.description.interpolated', "You're all set to start coding. You can open a local project or a remote repository to get your files into VS Code.\n{0}\n{1}", Button(localize('openFolder', "Open Folder"), 'command:workbench.action.addRootFolder'), Button(localize('openRepository', "Open Repository"), 'command:remoteHub.openRepository')),
|
||||
+ description: localize('gettingStarted.setup.OpenFolderWeb.description.interpolated', "You're all set to start coding. You can open a local project or a remote repository to get your files into !!APP_NAME!!.\n{0}\n{1}", Button(localize('openFolder', "Open Folder"), 'command:workbench.action.addRootFolder'), Button(localize('openRepository', "Open Repository"), 'command:remoteHub.openRepository')),
|
||||
when: 'workspaceFolderCount == 0',
|
||||
@@ -371,3 +325,3 @@ export const walkthroughs: GettingStartedWalkthroughContent = [
|
||||
@@ -376,3 +327,3 @@ export const walkthroughs: GettingStartedWalkthroughContent = [
|
||||
title: localize('gettingStarted.setupAccessibility.title', "Get Started with Accessibility Features"),
|
||||
- description: localize('gettingStarted.setupAccessibility.description', "Learn the tools and shortcuts that make VS Code accessible. Note that some actions are not actionable from within the context of the walkthrough."),
|
||||
+ description: localize('gettingStarted.setupAccessibility.description', "Learn the tools and shortcuts that make !!APP_NAME!! accessible. Note that some actions are not actionable from within the context of the walkthrough."),
|
||||
isFeatured: true,
|
||||
@@ -376,3 +330,3 @@ export const walkthroughs: GettingStartedWalkthroughContent = [
|
||||
@@ -381,3 +332,3 @@ export const walkthroughs: GettingStartedWalkthroughContent = [
|
||||
next: 'Setup',
|
||||
- walkthroughPageTitle: localize('gettingStarted.setupAccessibility.walkthroughPageTitle', 'Setup VS Code Accessibility'),
|
||||
+ walkthroughPageTitle: localize('gettingStarted.setupAccessibility.walkthroughPageTitle', 'Setup !!APP_NAME!! Accessibility'),
|
||||
content: {
|
||||
@@ -407,3 +361,3 @@ export const walkthroughs: GettingStartedWalkthroughContent = [
|
||||
@@ -412,3 +363,3 @@ export const walkthroughs: GettingStartedWalkthroughContent = [
|
||||
title: localize('gettingStarted.commandPaletteAccessibility.title', "Unlock productivity with the Command Palette "),
|
||||
- description: localize('gettingStarted.commandPaletteAccessibility.description.interpolated', "Run commands without reaching for your mouse to accomplish any task in VS Code.\n{0}", Button(localize('commandPalette', "Open Command Palette"), 'command:workbench.action.showCommands')),
|
||||
+ description: localize('gettingStarted.commandPaletteAccessibility.description.interpolated', "Run commands without reaching for your mouse to accomplish any task in !!APP_NAME!!.\n{0}", Button(localize('commandPalette', "Open Command Palette"), 'command:workbench.action.showCommands')),
|
||||
media: { type: 'markdown', path: 'empty' },
|
||||
@@ -484,3 +438,3 @@ export const walkthroughs: GettingStartedWalkthroughContent = [
|
||||
@@ -496,3 +447,3 @@ export const walkthroughs: GettingStartedWalkthroughContent = [
|
||||
media: {
|
||||
- type: 'svg', altText: 'VS Code Settings', path: 'settings.svg'
|
||||
+ type: 'svg', altText: '!!APP_NAME!! Settings', path: 'settings.svg'
|
||||
},
|
||||
@@ -490,6 +444,6 @@ export const walkthroughs: GettingStartedWalkthroughContent = [
|
||||
@@ -502,6 +453,6 @@ export const walkthroughs: GettingStartedWalkthroughContent = [
|
||||
title: localize('gettingStarted.extensions.title', "Code with extensions"),
|
||||
- description: localize('gettingStarted.extensions.description.interpolated', "Extensions are VS Code's power-ups. They range from handy productivity hacks, expanding out-of-the-box features, to adding completely new capabilities.\n{0}", Button(localize('browsePopular', "Browse Popular Extensions"), 'command:workbench.extensions.action.showPopularExtensions')),
|
||||
+ description: localize('gettingStarted.extensions.description.interpolated', "Extensions are !!APP_NAME!!'s power-ups. They range from handy productivity hacks, expanding out-of-the-box features, to adding completely new capabilities.\n{0}", Button(localize('browsePopular', "Browse Popular Extensions"), 'command:workbench.extensions.action.showPopularExtensions')),
|
||||
@@ -1221,7 +1202,7 @@ index c512b64..dfa2150 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),
|
||||
tags: [WORKSPACE_TRUST_SETTING_TAG],
|
||||
diff --git a/src/vs/workbench/services/extensionManagement/common/extensionManagementService.ts b/src/vs/workbench/services/extensionManagement/common/extensionManagementService.ts
|
||||
index e6805ca..f61cecc 100644
|
||||
index df1a6e3..14db691 100644
|
||||
--- a/src/vs/workbench/services/extensionManagement/common/extensionManagementService.ts
|
||||
+++ b/src/vs/workbench/services/extensionManagement/common/extensionManagementService.ts
|
||||
@@ -1044,3 +1044,3 @@ export class ExtensionManagementService extends CommontExtensionManagementServic
|
||||
|
||||
@@ -1,19 +1,19 @@
|
||||
diff --git a/build/linux/dependencies-generator.js b/build/linux/dependencies-generator.js
|
||||
index b544223..e9063ec 100644
|
||||
index ae05d17..c692141 100644
|
||||
--- a/build/linux/dependencies-generator.js
|
||||
+++ b/build/linux/dependencies-generator.js
|
||||
@@ -27,3 +27,3 @@ const product = require("../../product.json");
|
||||
// are valid, are in dep-lists.ts
|
||||
-const FAIL_BUILD_FOR_NEW_DEPENDENCIES = true;
|
||||
+const FAIL_BUILD_FOR_NEW_DEPENDENCIES = false;
|
||||
// Based on https://source.chromium.org/chromium/chromium/src/+/refs/tags/138.0.7204.235:chrome/installer/linux/BUILD.gn;l=64-80
|
||||
// Based on https://source.chromium.org/chromium/chromium/src/+/refs/tags/138.0.7204.251:chrome/installer/linux/BUILD.gn;l=64-80
|
||||
@@ -60,3 +60,3 @@ async function getDependencies(packageType, buildDir, applicationName, arch) {
|
||||
// Add the tunnel binary.
|
||||
- files.push(path_1.default.join(buildDir, 'bin', product.tunnelApplicationName));
|
||||
+ // files.push(path_1.default.join(buildDir, 'bin', product.tunnelApplicationName));
|
||||
// Add the main executable.
|
||||
diff --git a/build/linux/dependencies-generator.ts b/build/linux/dependencies-generator.ts
|
||||
index 00d7bc6..a5e256c 100644
|
||||
index 46c6d6c..23ae589 100644
|
||||
--- a/build/linux/dependencies-generator.ts
|
||||
+++ b/build/linux/dependencies-generator.ts
|
||||
@@ -25,3 +25,3 @@ import product = require('../../product.json');
|
||||
|
||||
3640
patches/linux/fix-dependencies.patch
Normal file
3640
patches/linux/fix-dependencies.patch
Normal file
File diff suppressed because it is too large
Load Diff
@@ -1,17 +1,15 @@
|
||||
diff --git a/build/npm/postinstall.js b/build/npm/postinstall.js
|
||||
index c1f22aa5002..a6fb2728b1f 100644
|
||||
index fa8da7d..abd8957 100644
|
||||
--- a/build/npm/postinstall.js
|
||||
+++ b/build/npm/postinstall.js
|
||||
@@ -53,8 +53,10 @@ function npmInstall(dir, opts) {
|
||||
log(dir, `Installing dependencies inside container ${process.env['VSCODE_REMOTE_DEPENDENCIES_CONTAINER_NAME']}...`);
|
||||
|
||||
@@ -55,5 +55,7 @@ function npmInstall(dir, opts) {
|
||||
opts.cwd = root;
|
||||
- if (process.env['npm_config_arch'] === 'arm64') {
|
||||
- run('sudo', ['docker', 'run', '--rm', '--privileged', 'multiarch/qemu-user-static', '--reset', '-p', 'yes'], opts);
|
||||
- }
|
||||
+ if ((process.env['npm_config_arch'] === 'arm64' || process.env['npm_config_arch'] === 'arm' || process.env['npm_config_arch'] === 'ppc64' || process.env['npm_config_arch'] === 'riscv64' || process.env['npm_config_arch'] === 's390x') && process.env['DISABLE_QEMU'] !== 'true') {
|
||||
+ run('sudo', ['docker', 'run', '--rm', '--privileged', 'tonistiigi/binfmt:latest', '--install', 'all'], opts);
|
||||
+ } else if (process.env['npm_config_arch'] === 'loong64') {
|
||||
+ run('sudo', ['docker', 'run', '--rm', '--privileged', 'loongcr.lcpu.dev/multiarch/archlinux', '--reset', '-p', 'yes'], opts);
|
||||
}
|
||||
run('sudo', ['docker', 'run', '-e', 'GITHUB_TOKEN', '-v', `${process.env['VSCODE_HOST_MOUNT']}:/root/vscode`, '-v', `${process.env['VSCODE_HOST_MOUNT']}/.build/.netrc:/root/.netrc`, '-w', path.resolve('/root/vscode', dir), process.env['VSCODE_REMOTE_DEPENDENCIES_CONTAINER_NAME'], 'sh', '-c', `\"chown -R root:root ${path.resolve('/root/vscode', dir)} && npm i -g node-gyp-build && npm ci\"`], opts);
|
||||
run('sudo', ['chown', '-R', `${userinfo.uid}:${userinfo.gid}`, `${path.resolve(root, dir)}`], opts);
|
||||
+ }
|
||||
run('sudo', [
|
||||
@@ -50,27 +50,27 @@ index 381d2f4..9cdec71 100644
|
||||
+ <target prefix="${regKey}" namespace="!!ORG_NAME!!.Policies.${regKey}" />
|
||||
</policyNamespaces>
|
||||
diff --git a/eslint.config.js b/eslint.config.js
|
||||
index d7b29f2..1eb07aa 100644
|
||||
index 127bb34..44d2b4c 100644
|
||||
--- a/eslint.config.js
|
||||
+++ b/eslint.config.js
|
||||
@@ -786,3 +786,3 @@ export default tseslint.config(
|
||||
@@ -800,3 +800,3 @@ export default tseslint.config(
|
||||
'@vscode/iconv-lite-umd',
|
||||
- '@vscode/policy-watcher',
|
||||
+ '@vscodium/policy-watcher',
|
||||
'@vscode/proxy-agent',
|
||||
diff --git a/package-lock.json b/package-lock.json
|
||||
index e4466bd..fd77ff8 100644
|
||||
index 4572a94..9f8c938 100644
|
||||
--- a/package-lock.json
|
||||
+++ b/package-lock.json
|
||||
@@ -18,3 +18,2 @@
|
||||
"@vscode/iconv-lite-umd": "0.7.0",
|
||||
- "@vscode/policy-watcher": "^1.3.2",
|
||||
"@vscode/proxy-agent": "^0.34.0",
|
||||
"@vscode/proxy-agent": "^0.35.0",
|
||||
@@ -29,2 +28,3 @@
|
||||
"@vscode/windows-registry": "^1.1.0",
|
||||
+ "@vscodium/policy-watcher": "^1.3.2-252465",
|
||||
"@xterm/addon-clipboard": "^0.2.0-beta.101",
|
||||
@@ -3270,22 +3270,2 @@
|
||||
"@xterm/addon-clipboard": "^0.2.0-beta.102",
|
||||
@@ -2960,22 +2960,2 @@
|
||||
},
|
||||
- "node_modules/@vscode/policy-watcher": {
|
||||
- "version": "1.3.2",
|
||||
@@ -93,7 +93,7 @@ index e4466bd..fd77ff8 100644
|
||||
- }
|
||||
- },
|
||||
"node_modules/@vscode/proxy-agent": {
|
||||
@@ -3682,2 +3662,22 @@
|
||||
@@ -3372,2 +3352,22 @@
|
||||
},
|
||||
+ "node_modules/@vscodium/policy-watcher": {
|
||||
+ "version": "1.3.2-252465",
|
||||
@@ -117,14 +117,14 @@ index e4466bd..fd77ff8 100644
|
||||
+ },
|
||||
"node_modules/@webassemblyjs/ast": {
|
||||
diff --git a/package.json b/package.json
|
||||
index 1120460..f74589f 100644
|
||||
index 8c0fdf3..0817f25 100644
|
||||
--- a/package.json
|
||||
+++ b/package.json
|
||||
@@ -78,3 +78,3 @@
|
||||
@@ -79,3 +79,3 @@
|
||||
"@vscode/iconv-lite-umd": "0.7.0",
|
||||
- "@vscode/policy-watcher": "^1.3.2",
|
||||
+ "@vscodium/policy-watcher": "^1.3.2-252465",
|
||||
"@vscode/proxy-agent": "^0.34.0",
|
||||
"@vscode/proxy-agent": "^0.35.0",
|
||||
diff --git a/src/vs/base/test/node/uri.perf.data.txt b/src/vs/base/test/node/uri.perf.data.txt
|
||||
index ee0a24b..881ce36 100644
|
||||
--- a/src/vs/base/test/node/uri.perf.data.txt
|
||||
|
||||
112
patches/sourcemaps.patch
Normal file
112
patches/sourcemaps.patch
Normal file
@@ -0,0 +1,112 @@
|
||||
diff --git a/build/gulpfile.extensions.js b/build/gulpfile.extensions.js
|
||||
index 7826f48..eca4a1d 100644
|
||||
--- a/build/gulpfile.extensions.js
|
||||
+++ b/build/gulpfile.extensions.js
|
||||
@@ -23,2 +23,3 @@ const plumber = require('gulp-plumber');
|
||||
const ext = require('./lib/extensions');
|
||||
+const product = require('../product.json');
|
||||
|
||||
@@ -74,3 +75,3 @@ const compilations = [
|
||||
|
||||
-const getBaseUrl = out => `https://main.vscode-cdn.net/sourcemaps/${commit}/${out}`;
|
||||
+const getBaseUrl = out => `https://github.com/VSCodium/sourcemaps/releases/download/${product.quality}-${commit}/${out.replaceAll('/', '-')}`;
|
||||
|
||||
diff --git a/build/gulpfile.reh.js b/build/gulpfile.reh.js
|
||||
index 10b7b44..79861bf 100644
|
||||
--- a/build/gulpfile.reh.js
|
||||
+++ b/build/gulpfile.reh.js
|
||||
@@ -454,3 +454,3 @@ function tweakProductForServerWeb(product) {
|
||||
util.rimraf(`out-vscode-${type}-min`),
|
||||
- optimize.minifyTask(`out-vscode-${type}`, `https://main.vscode-cdn.net/sourcemaps/${commit}/core`)
|
||||
+ optimize.minifyTask(`out-vscode-${type}`, `https://github.com/VSCodium/sourcemaps/releases/download/${product.quality}-${commit}/core`)
|
||||
));
|
||||
diff --git a/build/gulpfile.vscode.js b/build/gulpfile.vscode.js
|
||||
index ed06b6a..9488983 100644
|
||||
--- a/build/gulpfile.vscode.js
|
||||
+++ b/build/gulpfile.vscode.js
|
||||
@@ -147,3 +147,3 @@ gulp.task(bundleVSCodeTask);
|
||||
|
||||
-const sourceMappingURLBase = `https://main.vscode-cdn.net/sourcemaps/${commit}`;
|
||||
+const sourceMappingURLBase = `https://github.com/VSCodium/sourcemaps/releases/download/${product.quality}-${commit}`;
|
||||
const minifyVSCodeTask = task.define('minify-vscode', task.series(
|
||||
diff --git a/build/gulpfile.vscode.web.js b/build/gulpfile.vscode.web.js
|
||||
index 295a977..318ce92 100644
|
||||
--- a/build/gulpfile.vscode.web.js
|
||||
+++ b/build/gulpfile.vscode.web.js
|
||||
@@ -140,3 +140,3 @@ const minifyVSCodeWebTask = task.define('minify-vscode-web', task.series(
|
||||
util.rimraf('out-vscode-web-min'),
|
||||
- optimize.minifyTask('out-vscode-web', `https://main.vscode-cdn.net/sourcemaps/${commit}/core`)
|
||||
+ optimize.minifyTask('out-vscode-web', `https://github.com/VSCodium/sourcemaps/releases/download/${product.quality}-${commit}/core`)
|
||||
));
|
||||
diff --git a/build/lib/extensions.js b/build/lib/extensions.js
|
||||
index c80a1be..25cf259 100644
|
||||
--- a/build/lib/extensions.js
|
||||
+++ b/build/lib/extensions.js
|
||||
@@ -75,4 +75,5 @@ const vzip = require('gulp-vinyl-zip');
|
||||
const root = path_1.default.dirname(path_1.default.dirname(__dirname));
|
||||
+const product = JSON.parse(fs_1.default.readFileSync(path_1.default.join(root, 'product.json'), 'utf8'));
|
||||
const commit = (0, getVersion_1.getVersion)(root);
|
||||
-const sourceMappingURLBase = `https://main.vscode-cdn.net/sourcemaps/${commit}`;
|
||||
+const sourceMappingURLBase = `https://github.com/VSCodium/sourcemaps/releases/download/${product.quality}-${commit}`;
|
||||
function minifyExtensionResources(input) {
|
||||
@@ -205,3 +206,3 @@ function fromLocalWebpack(extensionPath, webpackConfigFileName, disableMangle) {
|
||||
data.contents = Buffer.from(contents.replace(/\n\/\/# sourceMappingURL=(.*)$/gm, function (_m, g1) {
|
||||
- return `\n//# sourceMappingURL=${sourceMappingURLBase}/extensions/${path_1.default.basename(extensionPath)}/${relativeOutputPath}/${g1}`;
|
||||
+ return `\n//# sourceMappingURL=${sourceMappingURLBase}/extensions-${path_1.default.basename(extensionPath).replaceAll('/', '-')}-${relativeOutputPath.replaceAll('/', '-')}-${g1.replaceAll('/', '-')}`;
|
||||
}), 'utf8');
|
||||
diff --git a/build/lib/extensions.ts b/build/lib/extensions.ts
|
||||
index 9e7cf9f..eed31ca 100644
|
||||
--- a/build/lib/extensions.ts
|
||||
+++ b/build/lib/extensions.ts
|
||||
@@ -30,4 +30,5 @@ const vzip = require('gulp-vinyl-zip');
|
||||
const root = path.dirname(path.dirname(__dirname));
|
||||
+const product = JSON.parse(fs.readFileSync(path.join(root, 'product.json'), 'utf8'));
|
||||
const commit = getVersion(root);
|
||||
-const sourceMappingURLBase = `https://main.vscode-cdn.net/sourcemaps/${commit}`;
|
||||
+const sourceMappingURLBase = `https://github.com/VSCodium/sourcemaps/releases/download/${product.quality}-${commit}`;
|
||||
|
||||
@@ -179,3 +180,3 @@ function fromLocalWebpack(extensionPath: string, webpackConfigFileName: string,
|
||||
data.contents = Buffer.from(contents.replace(/\n\/\/# sourceMappingURL=(.*)$/gm, function (_m, g1) {
|
||||
- return `\n//# sourceMappingURL=${sourceMappingURLBase}/extensions/${path.basename(extensionPath)}/${relativeOutputPath}/${g1}`;
|
||||
+ return `\n//# sourceMappingURL=${sourceMappingURLBase}/extensions-${path.basename(extensionPath).replaceAll('/', '-')}-${relativeOutputPath.replaceAll('/', '-')}-${g1.replaceAll('/', '-')}`;
|
||||
}), 'utf8');
|
||||
diff --git a/build/lib/optimize.js b/build/lib/optimize.js
|
||||
index fbc455b..4e7fe85 100644
|
||||
--- a/build/lib/optimize.js
|
||||
+++ b/build/lib/optimize.js
|
||||
@@ -186,3 +186,3 @@ function bundleTask(opts) {
|
||||
function minifyTask(src, sourceMapBaseUrl) {
|
||||
- const sourceMappingURL = sourceMapBaseUrl ? ((f) => `${sourceMapBaseUrl}/${f.relative}.map`) : undefined;
|
||||
+ const sourceMappingURL = sourceMapBaseUrl ? ((f) => `${sourceMapBaseUrl}-${f.relative.replaceAll('/', '-')}.map`) : undefined;
|
||||
return cb => {
|
||||
diff --git a/build/lib/optimize.ts b/build/lib/optimize.ts
|
||||
index d89d0d6..fca30cf 100644
|
||||
--- a/build/lib/optimize.ts
|
||||
+++ b/build/lib/optimize.ts
|
||||
@@ -211,3 +211,3 @@ export function bundleTask(opts: IBundleESMTaskOpts): () => NodeJS.ReadWriteStre
|
||||
export function minifyTask(src: string, sourceMapBaseUrl?: string): (cb: any) => void {
|
||||
- const sourceMappingURL = sourceMapBaseUrl ? ((f: any) => `${sourceMapBaseUrl}/${f.relative}.map`) : undefined;
|
||||
+ const sourceMappingURL = sourceMapBaseUrl ? ((f: any) => `${sourceMapBaseUrl}-${f.relative.replaceAll('/', '-')}.map`) : undefined;
|
||||
|
||||
diff --git a/build/lib/util.js b/build/lib/util.js
|
||||
index 389b9e0..f80d8e5 100644
|
||||
--- a/build/lib/util.js
|
||||
+++ b/build/lib/util.js
|
||||
@@ -235,4 +235,4 @@ function rewriteSourceMappingURL(sourceMappingURLBase) {
|
||||
const contents = f.contents.toString('utf8');
|
||||
- const str = `//# sourceMappingURL=${sourceMappingURLBase}/${path_1.default.dirname(f.relative).replace(/\\/g, '/')}/$1`;
|
||||
- f.contents = Buffer.from(contents.replace(/\n\/\/# sourceMappingURL=(.*)$/gm, str));
|
||||
+ const fp = path_1.default.dirname(f.relative).replace(/\\/g, '/').replaceAll('/', '-');
|
||||
+ f.contents = Buffer.from(contents.replace(/\n\/\/# sourceMappingURL=(.*)$/gm, (_m, p) => `//# sourceMappingURL=${sourceMappingURLBase}/${fp}-${p.replaceAll('/', '-')}`));
|
||||
return f;
|
||||
diff --git a/build/lib/util.ts b/build/lib/util.ts
|
||||
index 4931342..833091c 100644
|
||||
--- a/build/lib/util.ts
|
||||
+++ b/build/lib/util.ts
|
||||
@@ -285,4 +285,4 @@ export function rewriteSourceMappingURL(sourceMappingURLBase: string): NodeJS.Re
|
||||
const contents = (<Buffer>f.contents).toString('utf8');
|
||||
- const str = `//# sourceMappingURL=${sourceMappingURLBase}/${path.dirname(f.relative).replace(/\\/g, '/')}/$1`;
|
||||
- f.contents = Buffer.from(contents.replace(/\n\/\/# sourceMappingURL=(.*)$/gm, str));
|
||||
+ const fp = path.dirname(f.relative).replace(/\\/g, '/').replaceAll('/', '-');
|
||||
+ f.contents = Buffer.from(contents.replace(/\n\/\/# sourceMappingURL=(.*)$/gm, (_m, p) => `//# sourceMappingURL=${sourceMappingURLBase}/${fp}-${p.replaceAll('/', '-')}`));
|
||||
return f;
|
||||
@@ -18,6 +18,13 @@ mkdir -p assets
|
||||
git archive --format tar.gz --output="./assets/${APP_NAME}-${RELEASE_VERSION}-src.tar.gz" HEAD
|
||||
git archive --format zip --output="./assets/${APP_NAME}-${RELEASE_VERSION}-src.zip" HEAD
|
||||
|
||||
if [[ "${VSCODE_QUALITY}" == "insider" ]]; then
|
||||
COMMIT_ID=$( git rev-parse HEAD )
|
||||
|
||||
jsonTmp=$( jq -n --arg 'tag' "${RELEASE_VERSION}" --arg 'id' "${BUILD_SOURCEVERSION}" --arg 'commit' "${COMMIT_ID}" '{ "tag": $tag, "id": $id, "commit": $commit }' )
|
||||
echo "${jsonTmp}" > "./assets/buildinfo.json" && unset jsonTmp
|
||||
fi
|
||||
|
||||
cd assets
|
||||
|
||||
for FILE in *; do
|
||||
|
||||
22
product.json
22
product.json
@@ -60,6 +60,12 @@
|
||||
"contribEditSessions",
|
||||
"authenticationChallenges"
|
||||
],
|
||||
"ms-toolsai.vscode-ai": [
|
||||
"authenticationChallenges"
|
||||
],
|
||||
"TeamsDevApp.vscode-ai-foundry": [
|
||||
"authenticationChallenges"
|
||||
],
|
||||
"ms-vscode.vscode-selfhost-test-provider": [
|
||||
"testObserver",
|
||||
"testRelatedCode"
|
||||
@@ -87,7 +93,8 @@
|
||||
"tunnels"
|
||||
],
|
||||
"ms-toolsai.vscode-ai-remote": [
|
||||
"resolvers"
|
||||
"resolvers",
|
||||
"authenticationChallenges"
|
||||
],
|
||||
"ms-python.python": [
|
||||
"codeActionAI",
|
||||
@@ -221,10 +228,12 @@
|
||||
"treeViewMarkdownMessage"
|
||||
],
|
||||
"GitHub.copilot": [
|
||||
"inlineCompletionsAdditions"
|
||||
"inlineCompletionsAdditions",
|
||||
"devDeviceId"
|
||||
],
|
||||
"GitHub.copilot-nightly": [
|
||||
"inlineCompletionsAdditions"
|
||||
"inlineCompletionsAdditions",
|
||||
"devDeviceId"
|
||||
],
|
||||
"GitHub.copilot-chat": [
|
||||
"interactive",
|
||||
@@ -274,7 +283,9 @@
|
||||
"resolvers",
|
||||
"taskExecutionTerminal",
|
||||
"dataChannels",
|
||||
"chatSessionsProvider"
|
||||
"chatSessionsProvider",
|
||||
"devDeviceId",
|
||||
"contribEditorContentMenu"
|
||||
],
|
||||
"GitHub.remotehub": [
|
||||
"contribRemoteHelp",
|
||||
@@ -292,7 +303,8 @@
|
||||
"timeline"
|
||||
],
|
||||
"ms-python.vscode-pylance": [
|
||||
"terminalShellEnv"
|
||||
"terminalShellEnv",
|
||||
"portsAttributes"
|
||||
],
|
||||
"ms-python.debugpy": [
|
||||
"contribViewsWelcome",
|
||||
|
||||
@@ -109,7 +109,6 @@ copy_env_variable GDK_BACKEND
|
||||
copy_env_variable GTK_PATH
|
||||
copy_env_variable GTK_EXE_PREFIX
|
||||
copy_env_variable GTK_IM_MODULE_FILE
|
||||
copy_env_variable LIBGL_DRIVERS_PATH
|
||||
|
||||
# XDG Config
|
||||
prepend_dir XDG_CONFIG_DIRS "$SNAP/etc/xdg"
|
||||
@@ -121,16 +120,12 @@ prepend_dir XDG_DATA_DIRS "$SNAP/data-dir"
|
||||
prepend_dir XDG_DATA_DIRS "$SNAP_USER_DATA"
|
||||
|
||||
# Set XDG_DATA_HOME to local path
|
||||
ensure_dir_exists "$SNAP_USER_DATA/.local/share"
|
||||
export XDG_DATA_HOME="$SNAP_USER_DATA/.local/share"
|
||||
ensure_dir_exists "$XDG_DATA_HOME"
|
||||
|
||||
# Workaround for GLib < 2.53.2 not searching for schemas in $XDG_DATA_HOME:
|
||||
# https://bugzilla.gnome.org/show_bug.cgi?id=741335
|
||||
prepend_dir XDG_DATA_DIRS "$SNAP_USER_DATA/.local/share"
|
||||
|
||||
# Use the snap MESA drivers to launch the snap.
|
||||
# This is required by wayland, but electron will make better use under X11 too
|
||||
prepend_dir LIBGL_DRIVERS_PATH "$SNAP/usr/lib/dri"
|
||||
prepend_dir LIBGL_DRIVERS_PATH "$SNAP/usr/lib/$ARCH/dri"
|
||||
prepend_dir XDG_DATA_DIRS "$XDG_DATA_HOME"
|
||||
|
||||
# Set cache folder to local path
|
||||
if [[ -d "$SNAP_USER_DATA/.cache" && ! -e "$SNAP_USER_COMMON/.cache" ]]; then
|
||||
@@ -158,28 +153,45 @@ if [[ -n "$XDG_RUNTIME_DIR" && -z "$DISABLE_WAYLAND" ]] && \
|
||||
if [ -n "$WAYLAND_DISPLAY" ]; then
|
||||
wdisplay="$WAYLAND_DISPLAY"
|
||||
fi
|
||||
wayland_sockpath="$XDG_RUNTIME_DIR/../$wdisplay"
|
||||
wayland_snappath="$XDG_RUNTIME_DIR/$wdisplay"
|
||||
if [ -S "$wayland_snappath" ]; then
|
||||
if [ -S "$wayland_sockpath" ]; then
|
||||
# if running under wayland, use it
|
||||
#export WAYLAND_DEBUG=1
|
||||
# shellcheck disable=SC2034
|
||||
wayland_available=true
|
||||
# create the compat symlink for now
|
||||
if [ ! -e "$wayland_snappath" ]; then
|
||||
ln -s "$wayland_sockpath" "$wayland_snappath"
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
|
||||
# Keep an array of data dirs, for looping through them
|
||||
IFS=':' read -r -a data_dirs_array <<< "$XDG_DATA_DIRS"
|
||||
|
||||
# Build mime.cache
|
||||
# needed for gtk and qt icon
|
||||
# Font Config
|
||||
export FONTCONFIG_PATH="/etc/fonts"
|
||||
export FONTCONFIG_FILE="/etc/fonts/fonts.conf"
|
||||
|
||||
if [ "$needs_update" = true ]; then
|
||||
rm -rf "$XDG_DATA_HOME"/fonts
|
||||
|
||||
if [ -d "$SNAP_REAL_HOME/.local/share/fonts" ]; then
|
||||
ln -s "$SNAP_REAL_HOME/.local/share/fonts" "$XDG_DATA_HOME/fonts"
|
||||
fi
|
||||
fi
|
||||
|
||||
# Build mime.cache needed for gtk and qt icon
|
||||
# @TODO: Re-enable this once we move to core22
|
||||
if [ "$needs_update" = true ]; then
|
||||
rm -rf "$SNAP_USER_DATA/.local/share/mime"
|
||||
if [ ! -f "$SNAP/usr/share/mime/mime.cache" ]; then
|
||||
if command -v update-mime-database >/dev/null; then
|
||||
cp --preserve=timestamps -dR "$SNAP/usr/share/mime" "$SNAP_USER_DATA/.local/share"
|
||||
async_exec update-mime-database "$SNAP_USER_DATA/.local/share/mime"
|
||||
fi
|
||||
fi
|
||||
# if [ ! -f "$SNAP/usr/share/mime/mime.cache" ]; then
|
||||
# if command -v update-mime-database >/dev/null; then
|
||||
# cp --preserve=timestamps -dR "$SNAP/usr/share/mime" "$SNAP_USER_DATA/.local/share"
|
||||
# async_exec update-mime-database "$SNAP_USER_DATA/.local/share/mime"
|
||||
# fi
|
||||
# fi
|
||||
fi
|
||||
|
||||
# Gio modules and cache (including gsettings module)
|
||||
|
||||
@@ -59,7 +59,6 @@ parts:
|
||||
- libnss3
|
||||
- libpango-1.0-0
|
||||
- libsecret-1-0
|
||||
- libvulkan1
|
||||
- libwayland-egl1
|
||||
- libxcomposite1
|
||||
- libxdamage1
|
||||
@@ -70,20 +69,14 @@ parts:
|
||||
- libxss1
|
||||
- locales-all
|
||||
- packagekit-gtk3-module
|
||||
- gnome-settings-daemon-common
|
||||
- xdg-utils
|
||||
prime:
|
||||
- -lib/udev
|
||||
- -usr/lib/systemd
|
||||
- -usr/share/doc
|
||||
- -usr/share/fonts
|
||||
- -usr/share/icons
|
||||
- -usr/share/lintian
|
||||
- -usr/share/man
|
||||
- -usr/share/codium/chrome-sandbox
|
||||
- -usr/share/@@NAME@@/libEGL.so*
|
||||
- -usr/share/@@NAME@@/libGLESv2.so*
|
||||
- -usr/share/@@NAME@@/libvulkan.so*
|
||||
- -usr/share/codium-insiders/chrome-sandbox
|
||||
build-attributes:
|
||||
- enable-patchelf
|
||||
override-prime: |
|
||||
@@ -103,9 +96,7 @@ parts:
|
||||
apps:
|
||||
codium:
|
||||
command: electron-launch $SNAP/usr/share/codium-insiders/bin/codium-insiders --no-sandbox
|
||||
desktop: usr/share/applications/codium-insiders.desktop
|
||||
common-id: codium-insiders.desktop
|
||||
|
||||
url-handler:
|
||||
command: electron-launch $SNAP/usr/share/codium-insiders/bin/codium-insiders --open-url --no-sandbox
|
||||
desktop: usr/share/applications/codium-insiders-url-handler.desktop
|
||||
|
||||
@@ -109,7 +109,6 @@ copy_env_variable GDK_BACKEND
|
||||
copy_env_variable GTK_PATH
|
||||
copy_env_variable GTK_EXE_PREFIX
|
||||
copy_env_variable GTK_IM_MODULE_FILE
|
||||
copy_env_variable LIBGL_DRIVERS_PATH
|
||||
|
||||
# XDG Config
|
||||
prepend_dir XDG_CONFIG_DIRS "$SNAP/etc/xdg"
|
||||
@@ -121,16 +120,12 @@ prepend_dir XDG_DATA_DIRS "$SNAP/data-dir"
|
||||
prepend_dir XDG_DATA_DIRS "$SNAP_USER_DATA"
|
||||
|
||||
# Set XDG_DATA_HOME to local path
|
||||
ensure_dir_exists "$SNAP_USER_DATA/.local/share"
|
||||
export XDG_DATA_HOME="$SNAP_USER_DATA/.local/share"
|
||||
ensure_dir_exists "$XDG_DATA_HOME"
|
||||
|
||||
# Workaround for GLib < 2.53.2 not searching for schemas in $XDG_DATA_HOME:
|
||||
# https://bugzilla.gnome.org/show_bug.cgi?id=741335
|
||||
prepend_dir XDG_DATA_DIRS "$SNAP_USER_DATA/.local/share"
|
||||
|
||||
# Use the snap MESA drivers to launch the snap.
|
||||
# This is required by wayland, but electron will make better use under X11 too
|
||||
prepend_dir LIBGL_DRIVERS_PATH "$SNAP/usr/lib/dri"
|
||||
prepend_dir LIBGL_DRIVERS_PATH "$SNAP/usr/lib/$ARCH/dri"
|
||||
prepend_dir XDG_DATA_DIRS "$XDG_DATA_HOME"
|
||||
|
||||
# Set cache folder to local path
|
||||
if [[ -d "$SNAP_USER_DATA/.cache" && ! -e "$SNAP_USER_COMMON/.cache" ]]; then
|
||||
@@ -158,28 +153,45 @@ if [[ -n "$XDG_RUNTIME_DIR" && -z "$DISABLE_WAYLAND" ]] && \
|
||||
if [ -n "$WAYLAND_DISPLAY" ]; then
|
||||
wdisplay="$WAYLAND_DISPLAY"
|
||||
fi
|
||||
wayland_sockpath="$XDG_RUNTIME_DIR/../$wdisplay"
|
||||
wayland_snappath="$XDG_RUNTIME_DIR/$wdisplay"
|
||||
if [ -S "$wayland_snappath" ]; then
|
||||
if [ -S "$wayland_sockpath" ]; then
|
||||
# if running under wayland, use it
|
||||
#export WAYLAND_DEBUG=1
|
||||
# shellcheck disable=SC2034
|
||||
wayland_available=true
|
||||
# create the compat symlink for now
|
||||
if [ ! -e "$wayland_snappath" ]; then
|
||||
ln -s "$wayland_sockpath" "$wayland_snappath"
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
|
||||
# Keep an array of data dirs, for looping through them
|
||||
IFS=':' read -r -a data_dirs_array <<< "$XDG_DATA_DIRS"
|
||||
|
||||
# Build mime.cache
|
||||
# needed for gtk and qt icon
|
||||
# Font Config
|
||||
export FONTCONFIG_PATH="/etc/fonts"
|
||||
export FONTCONFIG_FILE="/etc/fonts/fonts.conf"
|
||||
|
||||
if [ "$needs_update" = true ]; then
|
||||
rm -rf "$XDG_DATA_HOME"/fonts
|
||||
|
||||
if [ -d "$SNAP_REAL_HOME/.local/share/fonts" ]; then
|
||||
ln -s "$SNAP_REAL_HOME/.local/share/fonts" "$XDG_DATA_HOME/fonts"
|
||||
fi
|
||||
fi
|
||||
|
||||
# Build mime.cache needed for gtk and qt icon
|
||||
# @TODO: Re-enable this once we move to core22
|
||||
if [ "$needs_update" = true ]; then
|
||||
rm -rf "$SNAP_USER_DATA/.local/share/mime"
|
||||
if [ ! -f "$SNAP/usr/share/mime/mime.cache" ]; then
|
||||
if command -v update-mime-database >/dev/null; then
|
||||
cp --preserve=timestamps -dR "$SNAP/usr/share/mime" "$SNAP_USER_DATA/.local/share"
|
||||
async_exec update-mime-database "$SNAP_USER_DATA/.local/share/mime"
|
||||
fi
|
||||
fi
|
||||
# if [ ! -f "$SNAP/usr/share/mime/mime.cache" ]; then
|
||||
# if command -v update-mime-database >/dev/null; then
|
||||
# cp --preserve=timestamps -dR "$SNAP/usr/share/mime" "$SNAP_USER_DATA/.local/share"
|
||||
# async_exec update-mime-database "$SNAP_USER_DATA/.local/share/mime"
|
||||
# fi
|
||||
# fi
|
||||
fi
|
||||
|
||||
# Gio modules and cache (including gsettings module)
|
||||
|
||||
@@ -59,7 +59,6 @@ parts:
|
||||
- libnss3
|
||||
- libpango-1.0-0
|
||||
- libsecret-1-0
|
||||
- libvulkan1
|
||||
- libwayland-egl1
|
||||
- libxcomposite1
|
||||
- libxdamage1
|
||||
@@ -70,20 +69,14 @@ parts:
|
||||
- libxss1
|
||||
- locales-all
|
||||
- packagekit-gtk3-module
|
||||
- gnome-settings-daemon-common
|
||||
- xdg-utils
|
||||
prime:
|
||||
- -lib/udev
|
||||
- -usr/lib/systemd
|
||||
- -usr/share/doc
|
||||
- -usr/share/fonts
|
||||
- -usr/share/icons
|
||||
- -usr/share/lintian
|
||||
- -usr/share/man
|
||||
- -usr/share/codium/chrome-sandbox
|
||||
- -usr/share/@@NAME@@/libEGL.so*
|
||||
- -usr/share/@@NAME@@/libGLESv2.so*
|
||||
- -usr/share/@@NAME@@/libvulkan.so*
|
||||
build-attributes:
|
||||
- enable-patchelf
|
||||
override-prime: |
|
||||
@@ -103,9 +96,7 @@ parts:
|
||||
apps:
|
||||
codium:
|
||||
command: electron-launch $SNAP/usr/share/codium/bin/codium --no-sandbox
|
||||
desktop: usr/share/applications/codium.desktop
|
||||
common-id: codium.desktop
|
||||
|
||||
url-handler:
|
||||
command: electron-launch $SNAP/usr/share/codium/bin/codium --open-url --no-sandbox
|
||||
desktop: usr/share/applications/codium-url-handler.desktop
|
||||
|
||||
84
upload_sourcemaps.sh
Executable file
84
upload_sourcemaps.sh
Executable file
@@ -0,0 +1,84 @@
|
||||
#!/usr/bin/env bash
|
||||
|
||||
set -e
|
||||
|
||||
npm install -g checksum github-release-cli
|
||||
|
||||
mkdir -p sourcemaps
|
||||
cd sourcemaps
|
||||
|
||||
SOURCE_DIR="../vscode/.build/extensions"
|
||||
DESTINATION_DIR="extensions"
|
||||
|
||||
find "${SOURCE_DIR}" -type f -name "*.js.map" | while read -r SOURCE_FILE_PATH; do
|
||||
RELATIVE_PATH="${SOURCE_FILE_PATH#$SOURCE_DIR/}"
|
||||
FLATTENED_FILENAME="${RELATIVE_PATH//\//-}"
|
||||
|
||||
cp "${SOURCE_FILE_PATH}" "$DESTINATION_DIR-${FLATTENED_FILENAME}"
|
||||
done
|
||||
|
||||
SOURCE_DIR="../vscode/out-vscode-min"
|
||||
DESTINATION_DIR="core"
|
||||
|
||||
find "${SOURCE_DIR}" -type f -name "*.js.map" | while read -r SOURCE_FILE_PATH; do
|
||||
RELATIVE_PATH="${SOURCE_FILE_PATH#$SOURCE_DIR/}"
|
||||
FLATTENED_FILENAME="${RELATIVE_PATH//\//-}"
|
||||
|
||||
cp "${SOURCE_FILE_PATH}" "$DESTINATION_DIR-${FLATTENED_FILENAME}"
|
||||
done
|
||||
|
||||
tar czf "${APP_NAME}-${RELEASE_VERSION}-sourcemaps.tar.gz" *.js.map
|
||||
|
||||
find . -type f -name "*.js.map" | sort | xargs checksum -a sha256 > checksum.txt
|
||||
|
||||
checksum -a sha256 checksum.txt > checksum.txt.sha256
|
||||
checksum -a sha256 "${APP_NAME}-${RELEASE_VERSION}-sourcemaps.tar.gz" > "${APP_NAME}-${RELEASE_VERSION}-sourcemaps.tar.gz.sha256"
|
||||
|
||||
REPOSITORY_OWNER="${SOURCEMAPS_REPOSITORY/\/*/}"
|
||||
REPOSITORY_NAME="${SOURCEMAPS_REPOSITORY/*\//}"
|
||||
RELEASE_TAG="${VSCODE_QUALITY}-${BUILD_SOURCEVERSION}"
|
||||
|
||||
gh release create "${RELEASE_TAG}" --repo "${SOURCEMAPS_REPOSITORY}" --title "${RELEASE_VERSION}"
|
||||
|
||||
set +e
|
||||
|
||||
for FILE in *; do
|
||||
if [[ -f "${FILE}" ]]; then
|
||||
echo "::group::Uploading '${FILE}' at $( date "+%T" )"
|
||||
gh release upload --repo "${SOURCEMAPS_REPOSITORY}" "${RELEASE_TAG}" "${FILE}"
|
||||
|
||||
EXIT_STATUS=$?
|
||||
echo "exit: ${EXIT_STATUS}"
|
||||
|
||||
if (( "${EXIT_STATUS}" )); then
|
||||
for (( i=0; i<10; i++ )); do
|
||||
github-release delete --owner "${REPOSITORY_OWNER}" --repo "${REPOSITORY_NAME}" --tag "${RELEASE_TAG}" "${FILE}"
|
||||
|
||||
sleep $(( 15 * (i + 1)))
|
||||
|
||||
echo "RE-Uploading '${FILE}' at $( date "+%T" )"
|
||||
gh release upload --repo "${SOURCEMAPS_REPOSITORY}" "${RELEASE_TAG}" "${FILE}"
|
||||
|
||||
EXIT_STATUS=$?
|
||||
echo "exit: ${EXIT_STATUS}"
|
||||
|
||||
if ! (( "${EXIT_STATUS}" )); then
|
||||
break
|
||||
fi
|
||||
done
|
||||
echo "exit: ${EXIT_STATUS}"
|
||||
|
||||
if (( "${EXIT_STATUS}" )); then
|
||||
echo "'${FILE}' hasn't been uploaded!"
|
||||
|
||||
github-release delete --owner "${REPOSITORY_OWNER}" --repo "${REPOSITORY_NAME}" --tag "${RELEASE_TAG}" "${FILE}"
|
||||
|
||||
exit 1
|
||||
fi
|
||||
fi
|
||||
|
||||
echo "::endgroup::"
|
||||
fi
|
||||
done
|
||||
|
||||
cd ..
|
||||
@@ -1,4 +1,4 @@
|
||||
{
|
||||
"tag": "1.104.0",
|
||||
"commit": "f220831ea2d946c0dcb0f3eaa480eb435a2c1260"
|
||||
"tag": "1.105.0",
|
||||
"commit": "03c265b1adee71ac88f833e065f7bb956b60550a"
|
||||
}
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{
|
||||
"tag": "1.104.3",
|
||||
"commit": "385651c938df8a906869babee516bffd0ddb9829"
|
||||
"tag": "1.105.0",
|
||||
"commit": "03c265b1adee71ac88f833e065f7bb956b60550a"
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user