Skip to content

Commit 28fdcdf

Browse files
authored
Merge pull request #499 from skoniks/master
Fix utils canonical to valid posix
2 parents 8bc4111 + 233f829 commit 28fdcdf

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

test/utils.test.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -79,10 +79,10 @@ describe("utils - sanitizing functions :", () => {
7979
{ file: "./../file", result: "file" },
8080
{ file: "../../file", result: "file" },
8181
{ file: "../../file1/../file2", result: "file2" },
82-
{ file: "../subfolder/file2", result: `subfolder${pth.sep}file2` },
83-
{ file: "../subfolder2/file2", result: `subfolder2${pth.sep}file2` },
84-
{ file: "../subfolder/file2", result: `subfolder${pth.sep}file2` },
85-
{ file: "../../subfolder2/file2", result: `subfolder2${pth.sep}file2` }
82+
{ file: "../subfolder/file2", result: "subfolder/file2" },
83+
{ file: "../subfolder2/file2", result: "subfolder2/file2" },
84+
{ file: "../subfolder/file2", result: "subfolder/file2" },
85+
{ file: "../../subfolder2/file2", result: "subfolder2/file2" }
8686
];
8787

8888
for (let test of tests) {

util/utils.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -208,7 +208,7 @@ Utils.canonical = function (/*string*/ path) {
208208
if (!path) return "";
209209
// trick normalize think path is absolute
210210
var safeSuffix = pth.posix.normalize("/" + path.split("\\").join("/"));
211-
return pth.join(".", safeSuffix);
211+
return pth.posix.join(".", safeSuffix);
212212
};
213213

214214
// make abolute paths taking prefix as root folder

0 commit comments

Comments
 (0)