Add support for # in resource urls

7h3Rabbit · 7h3Rabbit · commit bf93fe7391a0 · 2022-01-25T19:57:06.000+01:00
issue #68
diff --git a/Services/CssDependencyService.cs b/Services/CssDependencyService.cs
@@ -8,7 +8,7 @@ namespace StaticWebEpiserverPlugin.Services
 {
     public class CssDependencyService : ITextResourceDependencyService
     {
-        static readonly Regex REGEX_FIND_URL_REFERENCE = new Regex("url\\([\"|']{0,1}(?<resource>[^[\\)\"|']+)", RegexOptions.Compiled);
+        static readonly Regex REGEX_FIND_URL_REFERENCE = new Regex("url\\([\"']{0,1}(?<resource>[^[\\)\"'#]+)", RegexOptions.Compiled);
 
         public string EnsureDependencies(string referencingUrl, string content, IStaticWebService staticWebService, SiteConfigurationElement configuration, bool? useTemporaryAttribute, bool ignoreHtmlDependencies, Dictionary<string, string> currentPageResourcePairs = null, ConcurrentDictionary<string, string> replaceResourcePairs = null, int callDepth = 0)
         {
diff --git a/Services/HtmlDependencyService.cs b/Services/HtmlDependencyService.cs
@@ -9,9 +9,9 @@ namespace StaticWebEpiserverPlugin.Services
 {
     public class HtmlDependencyService : ITextResourceDependencyService
     {
-        static readonly Regex REGEX_FIND_SOURCE_REFERENCE = new Regex("<(source).*(srcset)=[\"|'](?<imageCandidates>[^\"|']+)[\"|']", RegexOptions.Compiled);
+        static readonly Regex REGEX_FIND_SOURCE_REFERENCE = new Regex("<(source).*(srcset)=[\"'](?<imageCandidates>[^\"']+)[\"'#]", RegexOptions.Compiled);
         static readonly Regex REGEX_FIND_SOURCE_RESOUCE_REFERENCE = new Regex("(?<resource>[^, ]+)( [0-9.]+[w|x][,]{0,1})*", RegexOptions.Compiled);
-        static readonly Regex REGEX_FIND_SCRIPT_OR_LINK_OR_IMG_OR_A_URL_REFERENCE = new Regex("<(script|link|img|a).*(href|src)=[\"|'](?<resource>[^\"|']+)", RegexOptions.Compiled);
+        static readonly Regex REGEX_FIND_SCRIPT_OR_LINK_OR_IMG_OR_A_URL_REFERENCE = new Regex("<(script|link|img|a).*(href|src)=[\"'](?<resource>[^\"'#]+)", RegexOptions.Compiled);
 
         public string EnsureDependencies(string referencingUrl, string content, IStaticWebService staticWebService, SiteConfigurationElement configuration, bool? useTemporaryAttribute, bool ignoreHtmlDependencies, Dictionary<string, string> currentPageResourcePairs = null, ConcurrentDictionary<string, string> replaceResourcePairs = null, int callDepth = 0)
         {
diff --git a/Services/SvgDependencyService.cs b/Services/SvgDependencyService.cs
@@ -9,7 +9,7 @@ namespace StaticWebEpiserverPlugin.Services
 {
     public class SvgDependencyService : ITextResourceDependencyService
     {
-        static readonly Regex REGEX_FIND_USE_URL_REFERENCE = new Regex("<(use).*(xlink:href)=[\"|'](?<resource>[^\"|']+)", RegexOptions.Compiled);
+        static readonly Regex REGEX_FIND_USE_URL_REFERENCE = new Regex("<(use).*(xlink:href)=[\"'](?<resource>[^\"#']+)", RegexOptions.Compiled);
 
         public string EnsureDependencies(string referencingUrl, string content, IStaticWebService staticWebService, SiteConfigurationElement configuration, bool? useTemporaryAttribute, bool ignoreHtmlDependencies, Dictionary<string, string> currentPageResourcePairs = null, ConcurrentDictionary<string, string> replaceResourcePairs = null, int callDepth = 0)
         {

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ namespace StaticWebEpiserverPlugin.Services`
`8`	`8`	`{`
`9`	`9`	`public class CssDependencyService : ITextResourceDependencyService`
`10`	`10`	`{`
`11`		`- static readonly Regex REGEX_FIND_URL_REFERENCE = new Regex("url\\([\"\|']{0,1}(?<resource>[^[\\)\"\|']+)", RegexOptions.Compiled);`
	`11`	`+ static readonly Regex REGEX_FIND_URL_REFERENCE = new Regex("url\\([\"']{0,1}(?<resource>[^[\\)\"'#]+)", RegexOptions.Compiled);`
`12`	`12`
`13`	`13`	`public string EnsureDependencies(string referencingUrl, string content, IStaticWebService staticWebService, SiteConfigurationElement configuration, bool? useTemporaryAttribute, bool ignoreHtmlDependencies, Dictionary<string, string> currentPageResourcePairs = null, ConcurrentDictionary<string, string> replaceResourcePairs = null, int callDepth = 0)`
`14`	`14`	`{`
Original file line number	Diff line number	Diff line change
`@@ -9,9 +9,9 @@ namespace StaticWebEpiserverPlugin.Services`
`9`	`9`	`{`
`10`	`10`	`public class HtmlDependencyService : ITextResourceDependencyService`
`11`	`11`	`{`
`12`		`- static readonly Regex REGEX_FIND_SOURCE_REFERENCE = new Regex("<(source).*(srcset)=[\"\|'](?<imageCandidates>[^\"\|']+)[\"\|']", RegexOptions.Compiled);`
	`12`	`+ static readonly Regex REGEX_FIND_SOURCE_REFERENCE = new Regex("<(source).*(srcset)=[\"'](?<imageCandidates>[^\"']+)[\"'#]", RegexOptions.Compiled);`
`13`	`13`	`static readonly Regex REGEX_FIND_SOURCE_RESOUCE_REFERENCE = new Regex("(?<resource>[^, ]+)( [0-9.]+[w\|x][,]{0,1})*", RegexOptions.Compiled);`
`14`		`- static readonly Regex REGEX_FIND_SCRIPT_OR_LINK_OR_IMG_OR_A_URL_REFERENCE = new Regex("<(script\|link\|img\|a).*(href\|src)=[\"\|'](?<resource>[^\"\|']+)", RegexOptions.Compiled);`
	`14`	`+ static readonly Regex REGEX_FIND_SCRIPT_OR_LINK_OR_IMG_OR_A_URL_REFERENCE = new Regex("<(script\|link\|img\|a).*(href\|src)=[\"'](?<resource>[^\"'#]+)", RegexOptions.Compiled);`
`15`	`15`
`16`	`16`	`public string EnsureDependencies(string referencingUrl, string content, IStaticWebService staticWebService, SiteConfigurationElement configuration, bool? useTemporaryAttribute, bool ignoreHtmlDependencies, Dictionary<string, string> currentPageResourcePairs = null, ConcurrentDictionary<string, string> replaceResourcePairs = null, int callDepth = 0)`
`17`	`17`	`{`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ namespace StaticWebEpiserverPlugin.Services`
`9`	`9`	`{`
`10`	`10`	`public class SvgDependencyService : ITextResourceDependencyService`
`11`	`11`	`{`
`12`		`- static readonly Regex REGEX_FIND_USE_URL_REFERENCE = new Regex("<(use).*(xlink:href)=[\"\|'](?<resource>[^\"\|']+)", RegexOptions.Compiled);`
	`12`	`+ static readonly Regex REGEX_FIND_USE_URL_REFERENCE = new Regex("<(use).*(xlink:href)=[\"'](?<resource>[^\"#']+)", RegexOptions.Compiled);`
`13`	`13`
`14`	`14`	`public string EnsureDependencies(string referencingUrl, string content, IStaticWebService staticWebService, SiteConfigurationElement configuration, bool? useTemporaryAttribute, bool ignoreHtmlDependencies, Dictionary<string, string> currentPageResourcePairs = null, ConcurrentDictionary<string, string> replaceResourcePairs = null, int callDepth = 0)`
`15`	`15`	`{`