fork/Graphite
1
0
Fork 0
mirror of https://github.com/GraphiteEditor/Graphite.git synced 2026-10-02 00:38:12 +08:00
Code Issues Packages Projects Releases Wiki Activity

Move branding and package install into cargo-run (#4266)

Browse Source 
* Move branding asset fetch into cargo-run

* Move frontend npm install into cargo-run

* Rename branding::ensure to branding::setup

* Wording nits

---------

Co-authored-by: Keavon Chambers <keavon@keavon.com>
This commit is contained in:
Timon
2026-06-22 20:21:46 +00:00
committed by GitHub
co-authored by Keavon Chambers
parent b286e89746
commit f798b48b83
11 changed files with 74 additions and 261 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tools/cargo-run/src/frontend.rs
+26 -1
View File
@@ -11,7 +11,32 @@ pub fn frontend_dir() -> PathBuf {
}
pub fn setup() -> Result<(), Error> {
utils::npm(["run", "setup"]).dir(frontend_dir()).run()
let frontend = frontend_dir();
let node_modules = frontend.join("node_modules");
let timestamp_path = node_modules.join(".install-timestamp");
let mtime = |p: PathBuf| std::fs::metadata(p).and_then(|m| m.modified()).ok();
if let Some(install_time) = mtime(timestamp_path.clone())
&& let Some(package_json_time) = mtime(frontend.join("package.json"))
&& let Some(package_lock_json_time) = mtime(frontend.join("package-lock.json"))
&& install_time >= package_json_time
&& install_time >= package_lock_json_time
{
return Ok(());
}
eprintln!("Installing npm packages...");
let install = || utils::npm(["ci", "--include=dev", "--prefer-offline", "--no-audit", "--no-fund"]).dir(&frontend).run();
if install().is_err() {
eprintln!("Failed to install npm packages. Wiping `frontend/node_modules` and retrying...");
let _ = std::fs::remove_dir_all(&node_modules);
install()?;
}
std::fs::write(&timestamp_path, "").map_err(|e| Error::Io(e, format!("writing '{}'", timestamp_path.display())))?;
eprintln!("Finished installing npm packages.");
Ok(())
}
pub fn build_wasm(release: bool, native: bool) -> Result<(), Error> {