Merge pull request cthackers#499 from skoniks/master

Fix utils canonical to valid posix
5saviahv · Jun 5, 2024 · 28fdcdf · 28fdcdf
2 parents 8bc4111 + 233f829
commit 28fdcdf
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/test/utils.test.js b/test/utils.test.js
@@ -79,10 +79,10 @@ describe("utils - sanitizing functions :", () => {
             { file: "./../file", result: "file" },
             { file: "../../file", result: "file" },
             { file: "../../file1/../file2", result: "file2" },
-            { file: "../subfolder/file2", result: `subfolder${pth.sep}file2` },
-            { file: "../subfolder2/file2", result: `subfolder2${pth.sep}file2` },
-            { file: "../subfolder/file2", result: `subfolder${pth.sep}file2` },
-            { file: "../../subfolder2/file2", result: `subfolder2${pth.sep}file2` }
+            { file: "../subfolder/file2", result: "subfolder/file2" },
+            { file: "../subfolder2/file2", result: "subfolder2/file2" },
+            { file: "../subfolder/file2", result: "subfolder/file2" },
+            { file: "../../subfolder2/file2", result: "subfolder2/file2" }
         ];
 
         for (let test of tests) {

diff --git a/util/utils.js b/util/utils.js
@@ -208,7 +208,7 @@ Utils.canonical = function (/*string*/ path) {
     if (!path) return "";
     // trick normalize think path is absolute
     var safeSuffix = pth.posix.normalize("/" + path.split("\\").join("/"));
-    return pth.join(".", safeSuffix);
+    return pth.posix.join(".", safeSuffix);
 };
 
 // make abolute paths taking prefix as root folder