fix: use pnpm workspace yaml file with pnpm happs (holochain#340)

c12i · Jul 22, 2024 · 84daa95 · 84daa95
1 parent 6cb5a8d
commit 84daa95
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/run_test.sh b/run_test.sh
@@ -59,7 +59,7 @@ setup_and_build_happ() {
 
   nix develop --command bash -c "
     set -e
-    pnpm -r install
+    pnpm install
     pnpm --filter ui build
     pnpm test
     pnpm package
@@ -77,7 +77,7 @@ setup_and_build_hello_world() {
 
   nix develop --command bash -c "
     set -e
-    pnpm -r install
+    pnpm install
     pnpm test
     "
   cd ..

diff --git a/src/scaffold/web_app/package_manager.rs b/src/scaffold/web_app/package_manager.rs
@@ -84,7 +84,7 @@ impl PackageManager {
         match self {
             PackageManager::Npm => "npm install",
             PackageManager::Yarn => "yarn install",
-            PackageManager::Pnpm => "pnpm -r install",
+            PackageManager::Pnpm => "pnpm install",
             PackageManager::Bun => "bun install",
         }
     }
@@ -227,7 +227,7 @@ mod tests {
     fn test_run_with_pnpm() {
         let app_file_tree = setup_filetree("pnpm-lock.yaml");
         let package_manager = PackageManager::try_from(&app_file_tree).unwrap();
-        let expected_command = "pnpm -r install";
+        let expected_command = "pnpm install";
         let actual_command = package_manager.run_command_string(SubCommand::Install, None);
         assert_eq!(expected_command, actual_command);
 

diff --git a/templates/generic/web-app/{{#if (eq package_manager "pnpm")}}pnpm-workspace.yaml{{¡if}}.hbs b/templates/generic/web-app/{{#if (eq package_manager "pnpm")}}pnpm-workspace.yaml{{¡if}}.hbs
@@ -0,0 +1,3 @@
+packages:
+  - "ui"
+  - "tests"