[1.x] Fix Vite Hot File Detection (#35)

* added automatic vite versioning * fix hot detection * fix hot tests to match laravel vite plugin * Fix manifest path to build --------- Co-authored-by: kapi2289 <[email protected]>
kapi2289 · Feb 23, 2025 · 5a1c858 · 5a1c858
1 parent 1c6c064
commit 5a1c858
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 8 deletions.
diff --git a/InertiaCore/Utils/Vite.cs b/InertiaCore/Utils/Vite.cs
@@ -30,9 +30,22 @@ protected internal void UseFileSystem(IFileSystem fileSystem)
     }
 
     /// <summary>
-    /// Get the public directory and build path.
+    /// Get the public directory
     /// </summary>
     private string GetPublicPathForFile(string path)
+    {
+        var pieces = new List<string> {
+            _options.Value.PublicDirectory,
+            path
+        };
+
+        return string.Join("/", pieces);
+    }
+
+    /// <summary>
+    /// Get the public directory and build path.
+    /// </summary>
+    private string GetBuildPathForFile(string path)
     {
         var pieces = new List<string> { _options.Value.PublicDirectory };
         if (!string.IsNullOrEmpty(_options.Value.BuildDirectory))
@@ -54,12 +67,12 @@ public HtmlString Input(string path)
             return new HtmlString(MakeModuleTag("@vite/client").Value + MakeModuleTag(path).Value);
         }
 
-        if (!_fileSystem.File.Exists(GetPublicPathForFile(_options.Value.ManifestFilename)))
+        if (!_fileSystem.File.Exists(GetBuildPathForFile(_options.Value.ManifestFilename)))
         {
             throw new Exception("Vite Manifest is missing. Run `npm run build` and try again.");
         }
 
-        var manifest = _fileSystem.File.ReadAllText(GetPublicPathForFile(_options.Value.ManifestFilename));
+        var manifest = _fileSystem.File.ReadAllText(GetBuildPathForFile(_options.Value.ManifestFilename));
         var manifestJson = JsonSerializer.Deserialize<Dictionary<string, JsonElement>>(manifest);
 
         if (manifestJson == null)
@@ -209,8 +222,8 @@ private static string GetString(IHtmlContent content)
 
     public string? GetManifest()
     {
-        return _fileSystem.File.Exists(GetPublicPathForFile(_options.Value.ManifestFilename))
-            ? _fileSystem.File.ReadAllText(GetPublicPathForFile(_options.Value.ManifestFilename))
+        return _fileSystem.File.Exists(GetBuildPathForFile(_options.Value.ManifestFilename))
+            ? _fileSystem.File.ReadAllText(GetBuildPathForFile(_options.Value.ManifestFilename))
             : null;
     }
 }

diff --git a/InertiaCoreTests/UnitTestVite.cs b/InertiaCoreTests/UnitTestVite.cs
@@ -37,7 +37,7 @@ public void TestHot()
     {
         var fileSystem = new MockFileSystem(new Dictionary<string, MockFileData>
         {
-            { @"/wwwroot/build/hot", new MockFileData("http://127.0.0.1:5174") },
+            { @"/wwwroot/hot", new MockFileData("http://127.0.0.1:5174") },
         });
         var options = new Mock<IOptions<ViteOptions>>();
         options.SetupGet(x => x.Value).Returns(new ViteOptions());
@@ -130,13 +130,12 @@ public void TestViteInput()
         result = mock.Object.Input("index.scss");
         Assert.That(result.ToString(), Is.EqualTo("<link href=\"/assets/index.css\" rel=\"stylesheet\" />\n\t"));
 
-
         // Hot file with css import
         options.SetupGet(x => x.Value).Returns(new ViteOptions
         {
             BuildDirectory = "build"
         });
-        fileSystem.AddFile(@"/wwwroot/build/hot", new MockFileData("http://127.0.0.1:5174"));
+        fileSystem.AddFile(@"/wwwroot/hot", new MockFileData("http://127.0.0.1:5174"));
 
         result = mock.Object.Input("index.scss");
         Assert.That(result.ToString(), Is.EqualTo(