💚 Use dotnet run

koeeenig · Jan 15, 2024 · 3998071 · 3998071
1 parent b1e1043
commit 3998071
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 9 deletions.
diff --git a/src/BlazeKit.Static/StaticSiteGenerator.cs b/src/BlazeKit.Static/StaticSiteGenerator.cs
@@ -68,6 +68,11 @@ public void Build()
 
     public async void Build(Type rootComponent)
     {
+        // copy wwwroot
+        var source = Path.Combine(this.wwwrootContent);
+        var destination = Path.Combine(this.outputDirectory);
+        Console.WriteLine($"Copying wwwroot from {source} to {destination}");
+        CopyDirectory(source, destination);
         var serviceCollection = new ServiceCollection();
 
         var routeManager = new StaticNavigationManager();
@@ -104,10 +109,6 @@ public async void Build(Type rootComponent)
                 throw;
             }
         }
-        // copy wwwroot
-        var source = Path.Combine(this.wwwrootContent);
-        var destination = Path.Combine(this.outputDirectory);
-        CopyDirectory(source, destination);
     }
 
     private void GeneratePage(string directory, string htmlContent)

diff --git a/src/BlazeKit.Website/BlazeKit.Website.csproj b/src/BlazeKit.Website/BlazeKit.Website.csproj
@@ -38,7 +38,7 @@
     <ProjectReference Include="..\BlazeKit.Static\BlazeKit.Static.csproj" />
   </ItemGroup>
 
-  <Target Name="SSG" AfterTargets="AfterPublish">
+  <!-- <Target Name="SSG" AfterTargets="AfterPublish">
     <PropertyGroup>
       <SourceFolder>$(PublishDir)wwwroot</SourceFolder>
       <DestinationFolder>$(PublishDir)..\ssg</DestinationFolder>
@@ -68,6 +68,6 @@
     <WriteLinesToFile File="$(VercelOutput)config.json" Lines="@(VercelOutputApiVersion)" Overwrite="true"></WriteLinesToFile>
     <Copy SourceFiles="@(FilesToCopy)" DestinationFolder="$(VercelOutput)output/static/%(RecursiveDir)" />
     <Exec Command="echo Deployment for Vercel finished" />
-  </Target>
+  </Target> -->
 
 </Project>
diff --git a/src/BlazeKit.Website/Program.cs b/src/BlazeKit.Website/Program.cs
@@ -7,8 +7,8 @@
 if (args.Count() > 0 && args[0] == "ssg") {
     Console.WriteLine("Building Static Site");
     new BlazeKit.Static.StaticSiteGenerator(
-        ".blazekit/build/ssg",
-        ".blazekit/build/tmp/wwwroot",
+        Path.Combine(".blazekit","build","ssg"),
+        Path.Combine(".blazekit","build","tmp","wwwroot"),
         typeof(BlazeKit.Website.Index).Assembly
     ).Build();
     Console.WriteLine("Static Site Built");

diff --git a/vercel.json b/vercel.json
@@ -1,5 +1,5 @@
 {
-  "buildCommand": "/vercel/.dotnet/dotnet publish ./src/BlazeKit.Website -o ./src/BlazeKit.Website/.blazekit/build/tmp",
+  "buildCommand": "cd ./src/BlazeKit.Website ; /vercel/.dotnet/dotnet publish -o .blazekit/build/tmp ; /vercel/.dotnet/dotnet run ssg ; cp -r .blazekit/build/ssg /.vercel/output/static",
   "installCommand": "chmod +x ./install.sh ; ./install.sh; export DOTNET_ROOT=$HOME/.dotnet ; export PATH=$PATH:$DOTNET_ROOT:$DOTNET_ROOT/tools ; /vercel/.dotnet/dotnet --version",
   "outputDirectory": ".vercel/output/static",
   "headers": [