Fixing the wait on installer for monorepos

Author: aaronpowell

src/CommunityToolkit.Aspire.Hosting.NodeJS.Extensions/NodeJSHostingExtensions.PackageInstallers.cs

@@ -26,13 +26,14 @@ public static IResourceBuilder<NodeAppResource> WithNpmPackageInstallation(this
             var installerBuilder = resource.ApplicationBuilder.AddResource(installer)
                 .WithArgs([useCI ? "ci" : "install"])
                 .WithParentRelationship(resource.Resource)
-                .ExcludeFromManifest()
-                .WithAnnotation(new JavaScriptPackageInstallerAnnotation(installer));
+                .ExcludeFromManifest();
 
             // Make the parent resource wait for the installer to complete
             resource.WaitForCompletion(installerBuilder);
 
             configureInstaller?.Invoke(installerBuilder);
+
+            resource.WithAnnotation(new JavaScriptPackageInstallerAnnotation(installer));
         }
 
         return resource;
@@ -55,13 +56,14 @@ public static IResourceBuilder<NodeAppResource> WithYarnPackageInstallation(this
             var installerBuilder = resource.ApplicationBuilder.AddResource(installer)
                 .WithArgs("install")
                 .WithParentRelationship(resource.Resource)
-                .ExcludeFromManifest()
-                .WithAnnotation(new JavaScriptPackageInstallerAnnotation(installer));
+                .ExcludeFromManifest();
 
             // Make the parent resource wait for the installer to complete
             resource.WaitForCompletion(installerBuilder);
 
             configureInstaller?.Invoke(installerBuilder);
+
+            resource.WithAnnotation(new JavaScriptPackageInstallerAnnotation(installer));
         }
 
         return resource;
@@ -84,13 +86,14 @@ public static IResourceBuilder<NodeAppResource> WithPnpmPackageInstallation(this
             var installerBuilder = resource.ApplicationBuilder.AddResource(installer)
                 .WithArgs("install")
                 .WithParentRelationship(resource.Resource)
-                .ExcludeFromManifest()
-                .WithAnnotation(new JavaScriptPackageInstallerAnnotation(installer));
+                .ExcludeFromManifest();
 
             // Make the parent resource wait for the installer to complete
             resource.WaitForCompletion(installerBuilder);
 
             configureInstaller?.Invoke(installerBuilder);
+
+            resource.WithAnnotation(new JavaScriptPackageInstallerAnnotation(installer));
         }
 
         return resource;
@@ -114,10 +117,11 @@ public static IResourceBuilder<NxResource> WithNpmPackageInstaller(this IResourc
             var installerBuilder = resource.ApplicationBuilder.AddResource(installer)
                 .WithArgs([useCI ? "ci" : "install"])
                 .WithParentRelationship(resource.Resource)
-                .ExcludeFromManifest()
-                .WithAnnotation(new JavaScriptPackageInstallerAnnotation(installer));
+                .ExcludeFromManifest();
 
             configureInstaller?.Invoke(installerBuilder);
+
+            resource.WithAnnotation(new JavaScriptPackageInstallerAnnotation(installer));
         }
 
         return resource;
@@ -140,10 +144,11 @@ public static IResourceBuilder<NxResource> WithYarnPackageInstaller(this IResour
             var installerBuilder = resource.ApplicationBuilder.AddResource(installer)
                 .WithArgs("install")
                 .WithParentRelationship(resource.Resource)
-                .ExcludeFromManifest()
-                .WithAnnotation(new JavaScriptPackageInstallerAnnotation(installer));
+                .ExcludeFromManifest();
 
             configureInstaller?.Invoke(installerBuilder);
+
+            resource.WithAnnotation(new JavaScriptPackageInstallerAnnotation(installer));
         }
 
         return resource;
@@ -166,10 +171,11 @@ public static IResourceBuilder<NxResource> WithPnpmPackageInstaller(this IResour
             var installerBuilder = resource.ApplicationBuilder.AddResource(installer)
                 .WithArgs("install")
                 .WithParentRelationship(resource.Resource)
-                .ExcludeFromManifest()
-                .WithAnnotation(new JavaScriptPackageInstallerAnnotation(installer));
+                .ExcludeFromManifest();
 
             configureInstaller?.Invoke(installerBuilder);
+
+            resource.WithAnnotation(new JavaScriptPackageInstallerAnnotation(installer));
         }
 
         return resource;
@@ -193,10 +199,11 @@ public static IResourceBuilder<TurborepoResource> WithNpmPackageInstaller(this I
             var installerBuilder = resource.ApplicationBuilder.AddResource(installer)
                 .WithArgs([useCI ? "ci" : "install"])
                 .WithParentRelationship(resource.Resource)
-                .ExcludeFromManifest()
-                .WithAnnotation(new JavaScriptPackageInstallerAnnotation(installer));
+                .ExcludeFromManifest();
 
             configureInstaller?.Invoke(installerBuilder);
+
+            resource.WithAnnotation(new JavaScriptPackageInstallerAnnotation(installer));
         }
 
         return resource;
@@ -219,10 +226,11 @@ public static IResourceBuilder<TurborepoResource> WithYarnPackageInstaller(this
             var installerBuilder = resource.ApplicationBuilder.AddResource(installer)
                 .WithArgs("install")
                 .WithParentRelationship(resource.Resource)
-                .ExcludeFromManifest()
-                .WithAnnotation(new JavaScriptPackageInstallerAnnotation(installer));
+                .ExcludeFromManifest();
 
             configureInstaller?.Invoke(installerBuilder);
+
+            resource.WithAnnotation(new JavaScriptPackageInstallerAnnotation(installer));
         }
 
         return resource;
@@ -245,10 +253,11 @@ public static IResourceBuilder<TurborepoResource> WithPnpmPackageInstaller(this
             var installerBuilder = resource.ApplicationBuilder.AddResource(installer)
                 .WithArgs("install")
                 .WithParentRelationship(resource.Resource)
-                .ExcludeFromManifest()
-                .WithAnnotation(new JavaScriptPackageInstallerAnnotation(installer));
+                .ExcludeFromManifest();
 
             configureInstaller?.Invoke(installerBuilder);
+
+            resource.WithAnnotation(new JavaScriptPackageInstallerAnnotation(installer));
         }
 
         return resource;

src/CommunityToolkit.Aspire.Hosting.NodeJS.Extensions/NodeJSHostingExtensions.cs

@@ -189,7 +189,7 @@ public static IResourceBuilder<TurborepoAppResource> AddApp(this IResourceBuilde
 
         if (builder.Resource.TryGetLastAnnotation<JavaScriptPackageInstallerAnnotation>(out var installerAnnotation))
         {
-            rb.WaitFor(builder.ApplicationBuilder.CreateResourceBuilder(installerAnnotation.Resource));
+            rb.WaitForCompletion(builder.ApplicationBuilder.CreateResourceBuilder(installerAnnotation.Resource));
         }
 
         configure?.Invoke(rb);