kalugin66/windmill
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: add the nobundling option for bun

Browse Source
This commit is contained in:
Ruben Fiszel
2024-07-28 10:56:04 +02:00
parent 9b2c2c96b4
commit b45ec20b83
2 changed files with 19 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
backend/windmill-common/src/worker.rs
View File

@@ -157,6 +157,7 @@ pub struct Annotations {
pub npm_mode: bool,
pub nodejs_mode: bool,
pub native_mode: bool,
pub nobundling: bool,
}
pub fn get_annotation(inner_content: &str) -> Annotations {
@@ -168,8 +169,9 @@ pub fn get_annotation(inner_content: &str) -> Annotations {
let nodejs_mode: bool = annotations.contains(&"nodejs".to_string());
let npm_mode: bool = annotations.contains(&"npm".to_string());
let native_mode: bool = annotations.contains(&"native".to_string());
let nobundling: bool = annotations.contains(&"nobundling".to_string());
Annotations { npm_mode, nodejs_mode, native_mode }
Annotations { npm_mode, nodejs_mode, native_mode, nobundling }
}
pub async fn load_cache(bin_path: &str, _remote_path: &str) -> (bool, String) {

28
backend/windmill-worker/src/bun_executor.rs
View File

@@ -582,6 +582,9 @@ pub async fn prebundle_script(
return Ok(());
}
let annotation = get_annotation(inner_content);
if annotation.nobundling {
return Ok(());
}
let origin = format!("{job_dir}/main.js");
write_file(job_dir, "main.ts", &remove_pinned_imports(inner_content)?).await?;
build_loader(
@@ -652,16 +655,18 @@ pub async fn handle_bun_job(
envs: HashMap<String, String>,
shared_mount: &str,
) -> error::Result<Box<RawValue>> {
let (mut bundle_cache, cache_logs, local_path, remote_path) = if requirements_o.is_some()
&& codebase.is_none()
{
let (local_path, remote_path) =
compute_bundle_local_and_remote_path(inner_content, &requirements_o);
let (cache, logs) = windmill_common::worker::load_cache(&local_path, &remote_path).await;
(cache, logs, local_path, remote_path)
} else {
(false, "".to_string(), "".to_string(), "".to_string())
};
let mut annotation = windmill_common::worker::get_annotation(inner_content);
let (mut bundle_cache, cache_logs, local_path, remote_path) =
if requirements_o.is_some() && !annotation.nobundling && codebase.is_none() {
let (local_path, remote_path) =
compute_bundle_local_and_remote_path(inner_content, &requirements_o);
let (cache, logs) =
windmill_common::worker::load_cache(&local_path, &remote_path).await;
(cache, logs, local_path, remote_path)
} else {
(false, "".to_string(), "".to_string(), "".to_string())
};
if !codebase.is_some() && !bundle_cache {
let _ = write_file(job_dir, "main.ts", inner_content).await?;
@@ -672,8 +677,6 @@ pub async fn handle_bun_job(
let common_bun_proc_envs: HashMap<String, String> =
get_common_bun_proc_envs(&base_internal_url).await;
let mut annotation = windmill_common::worker::get_annotation(inner_content);
if codebase.is_some() {
annotation.nodejs_mode = true
}
@@ -915,6 +918,7 @@ try {{
};
let build_cache = !bundle_cache
&& !annotation.nobundling
&& !codebase.is_some()
&& (requirements_o.is_some() || annotation.native_mode);