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

feat(1.116): update patches (#2796)

Browse Source
This commit is contained in:
Baptiste Augrain
2026-04-22 01:54:37 +02:00
committed by GitHub
parent 3db4d595d6
commit caebfcd986
23 changed files with 6019 additions and 600 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
patches/cli.patch
View File

@@ -1,5 +1,5 @@
diff --git a/cli/src/commands/serve_web.rs b/cli/src/commands/serve_web.rs
index d3f7db8..988024b 100644
index d3a9a88a..7cf60f0b 100644
--- a/cli/src/commands/serve_web.rs
+++ b/cli/src/commands/serve_web.rs
@@ -756,3 +756,3 @@ impl ConnectionManager {
@@ -13,10 +13,10 @@ index d3f7db8..988024b 100644
+ .join(args.release.quality.server_entrypoint().unwrap());
diff --git a/cli/src/constants.rs b/cli/src/constants.rs
index 1e277a8..97f17d3 100644
index 9e2b066d..974ee57c 100644
--- a/cli/src/constants.rs
+++ b/cli/src/constants.rs
@@ -35,3 +35,6 @@ pub const DOCUMENTATION_URL: Option<&'static str> = option_env!("VSCODE_CLI_DOCU
@@ -37,3 +37,6 @@ pub const DOCUMENTATION_URL: Option<&'static str> = option_env!("VSCODE_CLI_DOCU
pub const VSCODE_CLI_COMMIT: Option<&'static str> = option_env!("VSCODE_CLI_COMMIT");
-pub const VSCODE_CLI_UPDATE_ENDPOINT: Option<&'static str> = option_env!("VSCODE_CLI_UPDATE_URL");
+pub const VSCODE_CLI_UPDATE_ENDPOINT: Option<&'static str> = option_env!("VSCODE_CLI_UPDATE_ENDPOINT");
@@ -25,7 +25,7 @@ index 1e277a8..97f17d3 100644
+pub const VSCODE_CLI_BINARY_NAME: Option<&'static str> = option_env!("VSCODE_CLI_BINARY_NAME");
diff --git a/cli/src/options.rs b/cli/src/options.rs
index 7d152c0..c0f2fb2 100644
index 7d152c0e..c0f2fb2e 100644
--- a/cli/src/options.rs
+++ b/cli/src/options.rs
@@ -9,3 +9,3 @@ use serde::{Deserialize, Serialize};
@@ -57,8 +57,17 @@ index 7d152c0..c0f2fb2 100644
- server_name
+ Ok(server_name)
}
diff --git a/cli/src/tunnels/agent_host.rs b/cli/src/tunnels/agent_host.rs
index 9d1f240c..2e67da43 100644
--- a/cli/src/tunnels/agent_host.rs
+++ b/cli/src/tunnels/agent_host.rs
@@ -162,3 +162,3 @@ impl AgentHostManager {
.join("bin")
- .join(release.quality.server_entrypoint())
+ .join(release.quality.server_entrypoint().unwrap())
};
diff --git a/cli/src/tunnels/code_server.rs b/cli/src/tunnels/code_server.rs
index bbabadc..b454d0e 100644
index bbabadcf..b454d0ea 100644
--- a/cli/src/tunnels/code_server.rs
+++ b/cli/src/tunnels/code_server.rs
@@ -462,3 +462,3 @@ impl<'a> ServerBuilder<'a> {
@@ -67,7 +76,7 @@ index bbabadc..b454d0e 100644
+ .join(self.server_params.release.quality.server_entrypoint().unwrap()),
&["--version"],
diff --git a/cli/src/tunnels/paths.rs b/cli/src/tunnels/paths.rs
index 3d7d718..98529bc 100644
index 3d7d718a..98529bc6 100644
--- a/cli/src/tunnels/paths.rs
+++ b/cli/src/tunnels/paths.rs
@@ -100,3 +100,3 @@ impl InstalledServer {
@@ -76,7 +85,7 @@ index 3d7d718..98529bc 100644
+ .join(self.quality.server_entrypoint().unwrap())
},
diff --git a/cli/src/update_service.rs b/cli/src/update_service.rs
index 55f1dad..3b7ef5c 100644
index 55f1dadc..3b7ef5c4 100644
--- a/cli/src/update_service.rs
+++ b/cli/src/update_service.rs
@@ -10,3 +10,3 @@ use serde::{Deserialize, Serialize};
@@ -303,7 +312,7 @@ index 55f1dad..3b7ef5c 100644
-
pub fn env_default() -> Option<Platform> {
diff --git a/extensions/tunnel-forwarding/src/extension.ts b/extensions/tunnel-forwarding/src/extension.ts
index 2f71999..e689f62 100644
index 2f71999b..e689f628 100644
--- a/extensions/tunnel-forwarding/src/extension.ts
+++ b/extensions/tunnel-forwarding/src/extension.ts
@@ -37,3 +37,3 @@ if (process.env.VSCODE_FORWARDING_IS_DEV) {