Fix base path (#4276)

* fix base path

* remove log

* fix clippy
This commit is contained in:
Evan Almloff authored and GitHub committed 2025-06-19 21:24:26 -07:00
1 parent e086d6765b
commit 10a63d07e2
3 files changed
+38 -18

No files matched your search

+11 -15
View File
@@ -3841,7 +3841,7 @@ impl BuildRequest {
};
// Inject any resources from the config into the html
self.inject_resources(assets, &mut html)?;
self.inject_resources(assets, wasm_path, &mut html)?;
// Inject loading scripts if they are not already present
self.inject_loading_scripts(&mut html);
@@ -3860,7 +3860,12 @@ impl BuildRequest {
}
// Inject any resources from the config into the html
fn inject_resources(&self, assets: &AssetManifest, html: &mut String) -> Result<()> {
fn inject_resources(
&self,
assets: &AssetManifest,
wasm_path: &str,
html: &mut String,
) -> Result<()> {
use std::fmt::Write;
// Collect all resources into a list of styles and scripts
@@ -3930,19 +3935,10 @@ impl BuildRequest {
}
// Manually inject the wasm file for preloading. WASM currently doesn't support preloading in the manganis asset system
let wasm_source_path = self.wasm_bindgen_wasm_output_file();
if let Some(wasm_assets) = assets.get_assets_for_source(&wasm_source_path) {
let wasm_path = wasm_assets
.iter()
.next()
.expect("There should be exactly one optimized wasm asset");
let wasm_path = wasm_path.bundled_path();
head_resources.push_str(&format!(
"<link rel=\"preload\" as=\"fetch\" type=\"application/wasm\" href=\"/{{base_path}}/assets/{wasm_path}\" crossorigin>"
));
Self::replace_or_insert_before("{style_include}", "</head", &head_resources, html);
}
head_resources.push_str(&format!(
"<link rel=\"preload\" as=\"fetch\" type=\"application/wasm\" href=\"/{{base_path}}/assets/{wasm_path}\" crossorigin>"
));
Self::replace_or_insert_before("{style_include}", "</head", &head_resources, html);
Ok(())
}