story-kit: merge 243_bug_replace_pnpm_with_npm
This commit is contained in:
@@ -18,7 +18,7 @@ fn main() {
|
||||
println!("cargo:rerun-if-changed=build.rs");
|
||||
println!("cargo:rerun-if-env-changed=PROFILE");
|
||||
println!("cargo:rerun-if-changed=../frontend/package.json");
|
||||
println!("cargo:rerun-if-changed=../frontend/pnpm-lock.yaml");
|
||||
println!("cargo:rerun-if-changed=../frontend/package-lock.json");
|
||||
println!("cargo:rerun-if-changed=../frontend/vite.config.ts");
|
||||
println!("cargo:rerun-if-changed=../frontend/index.html");
|
||||
println!("cargo:rerun-if-changed=../frontend/src");
|
||||
@@ -30,7 +30,7 @@ fn main() {
|
||||
}
|
||||
|
||||
// When cross-compiling (e.g. musl via `cross`), the Docker container
|
||||
// has no Node/pnpm. The release script builds macOS first, so
|
||||
// has no Node/npm. The release script builds macOS first, so
|
||||
// frontend/dist/ already exists. Skip the frontend build in that case.
|
||||
let target = env::var("TARGET").unwrap_or_default();
|
||||
let host = env::var("HOST").unwrap_or_default();
|
||||
@@ -45,6 +45,6 @@ fn main() {
|
||||
let frontend_dir = Path::new("../frontend");
|
||||
|
||||
// Ensure dependencies are installed and build the frontend bundle.
|
||||
run("pnpm", &["install"], frontend_dir);
|
||||
run("pnpm", &["build"], frontend_dir);
|
||||
run("npm", &["install"], frontend_dir);
|
||||
run("npm", &["run", "build"], frontend_dir);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user