fork/Graphite
1
0
Fork 0
mirror of https://github.com/GraphiteEditor/Graphite.git synced 2026-09-15 14:18:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

Auto-recover from corrupt Wasm builds that emit undefined env imports (#4287)

Browse Source 
Co-authored-by: Keavon Chambers <keavon@keavon.com>
This commit is contained in:
Timon
2026-06-30 22:07:17 +00:00
parent 9626c047a4
commit 0882637801
1 changed files with 30 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
tools/cargo-run/src/frontend.rs
View File

@@ -10,6 +10,10 @@ pub fn frontend_dir() -> PathBuf {
workspace_dir().join("frontend")
}
fn wasm_glue_path() -> PathBuf {
frontend_dir().join("wrapper").join("pkg").join(format!("{OUT_NAME}.js"))
}
pub fn setup() -> Result<(), Error> {
let frontend = frontend_dir();
let node_modules = frontend.join("node_modules");
@@ -52,7 +56,13 @@ pub fn build_wasm_steps(release: bool, native: bool) -> Vec<Expression> {
cmd!("cargo", "build", "--lib", "--package", WRAPPER_CRATE, "--target", WASM_TARGET)
.arg_if(release, "--release")
.args_if(native, ["--no-default-features", "--features", "native"])
.dir(workspace_dir()),
.dir(workspace_dir())
.before_spawn(|_| {
if is_build_corrupted() {
clean_wasm();
}
Ok(())
}),
cmd!("wasm-bindgen", "--target", "web", "--out-name", OUT_NAME, "--out-dir", &pkg_dir, &wasm_artifact)
.arg_if(release, "--no-demangle")
.arg_if(!release, "--debug"),
@@ -66,6 +76,25 @@ pub fn build_wasm_steps(release: bool, native: bool) -> Vec<Expression> {
steps
}
pub fn clean_wasm() -> bool {
let wasm_target_dir = target_dir().join(WASM_TARGET);
eprintln!("The Wasm build emitted undefined `env` imports, a sign of corrupt incremental artifacts (typically from an interrupted build).");
eprintln!("Fixing by wiping `{}` and rebuilding...", wasm_target_dir.display());
match std::fs::remove_dir_all(&wasm_target_dir) {
Ok(()) => {}
Err(e) if e.kind() == std::io::ErrorKind::NotFound => {}
Err(e) => eprintln!("warning: could not fully clean `{}`: {e}", wasm_target_dir.display()),
}
true
}
pub fn is_build_corrupted() -> bool {
let Ok(js) = std::fs::read_to_string(wasm_glue_path()) else {
return false;
};
js.contains("from \"env\"") || js.contains("from 'env'")
}
pub fn vite() -> Expression {
utils::node_bin("vite/bin/vite.js").dir(frontend_dir()).env("CARGO_TARGET_DIR", target_dir())
}