Skip to content

Commit db11f41

Browse files
authored
Merge pull request #62 from papergirl/master
Fix to issue #61 regarding relative file paths not resolving correctly
2 parents bd7c920 + 74dd343 commit db11f41

File tree

2 files changed

+8
-2
lines changed

2 files changed

+8
-2
lines changed

RequireJsNet.Compressor/RequireProcessing/AutoBundleConfigProcessor.cs

+2-1
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,8 @@ public override List<Bundle> ParseConfigs()
9999
var processor = new ScriptProcessor(relativePath, fileText, Configuration);
100100
processor.Process();
101101
var result = processor.ProcessedString;
102-
var dependencies = processor.Dependencies.Select(r => this.ResolvePhysicalPath(r)).Where(r => r != null).Distinct().ToList();
102+
var fileDirectory = new FileInfo(file).DirectoryName;
103+
var dependencies = processor.Dependencies.Select(r => this.ResolvePhysicalPath(r, fileDirectory)).Where(r => r != null).Distinct().ToList();
103104
tempFileList.Add(new RequireFile
104105
{
105106
Name = file,

RequireJsNet.Compressor/RequireProcessing/ConfigProcessor.cs

+6-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ internal abstract class ConfigProcessor
3434

3535
public abstract List<Bundle> ParseConfigs();
3636

37-
protected string ResolvePhysicalPath(string relativePath)
37+
protected string ResolvePhysicalPath(string relativePath, string directory = "")
3838
{
3939
string entry = this.EntryPoint;
4040
if (!string.IsNullOrEmpty(EntryOverride))
@@ -52,6 +52,11 @@ protected string ResolvePhysicalPath(string relativePath)
5252
relativePath = relativePath.Substring(1);
5353
}
5454

55+
if (relativePath.StartsWith("./") && !string.IsNullOrEmpty(directory))
56+
{
57+
relativePath = directory + "/" + relativePath.Substring(2);
58+
}
59+
5560
string filePath;
5661

5762
try

0 commit comments

Comments
 (0)