Support virtual paths (~/) in RelativePathAdjuster (#318)

[release]

Author: alexreinert

src/WebOptimizer.Core/Processors/RelativePathAdjuster.cs

@@ -1,13 +1,10 @@
 using System;
 using System.Collections.Generic;
-using System.IO;
 using System.Text.RegularExpressions;
 using System.Threading.Tasks;
-using System.Linq;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.Extensions.FileProviders;
 using WebOptimizer;
-using Microsoft.AspNetCore.DataProtection.KeyManagement;
 using WebOptimizer.Utils;
 
 namespace WebOptimizer
@@ -75,9 +72,17 @@ private static byte[] Adjust(IAssetContext config, string key)
                 string queryOnly = pathAndQuery.Length == 2 ? ("?" + pathAndQuery[1]) : string.Empty;
 
                 // get filepath of included file
-                if (!UrlPathUtils.TryMakeAbsolutePathFromInclude(appPath, key, pathOnly, out string filePath))
-                    // path to included file is invalid
-                    return match.Value;
+                string filePath;
+                if (pathOnly.StartsWith("~/"))
+                {
+                    filePath = UrlPathUtils.MakeAbsolute(appPath, pathOnly.Substring(2));
+                }
+                else
+                {
+                    if (!UrlPathUtils.TryMakeAbsolutePathFromInclude(appPath, key, pathOnly, out filePath))
+                        // path to included file is invalid
+                        return match.Value;
+                }
 
                 string relativePath = MakeRelative(routePath, filePath);
 

test/WebOptimizer.Core.Test/Processors/RelativePathAdjusterTest.cs

@@ -1,5 +1,4 @@
 using System.Collections.Generic;
-using System.IO;
 using System.Linq;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Hosting;
@@ -28,6 +27,11 @@ public class RelativePathAdjusterTest
         [InlineData("/dist/all.css", "css/site.css", "url(../img/foo.png)", "url(../img/foo.png)")]
         [InlineData("dist/all.css", "css/site.css", "url(img/foo.png)", "url(../css/img/foo.png)")]
         [InlineData("dist/all.css", "css/site.css", "url(../img/foo.png)", "url(../img/foo.png)")]
+        [InlineData("/css/all.css", "css/site.css", "url(~/img/foo.png)", "url(../img/foo.png)")]
+        [InlineData("/css/all.css", "css/sub/site.css", "url(~/img/foo.png)", "url(../img/foo.png)")]
+        [InlineData("/dist/sub/all.css", "css/sub/site.css", "url(~/img/foo.png)", "url(../../img/foo.png)")]
+        [InlineData("/dist/sub/all.css", "css/site.css", "url(~/img/foo.png)", "url(../../img/foo.png)")]
+        [InlineData("dist/sub/all.css", "css/site.css", "url(~/img/foo.png)", "url(../../img/foo.png)")]
         public async Task AdjustRelativePaths_Success(string route, string inputPath, string url, string newUrl)
         {
             var adjuster = new RelativePathAdjuster();