fix(path-utils): fix relativePath

Anidetrix · Mar 18, 2020 · e22ca71 · e22ca71
1 parent 19711fc
commit e22ca71
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 16 deletions.
diff --git a/src/utils/path-utils.ts b/src/utils/path-utils.ts
@@ -46,5 +46,5 @@ export function isAbsolutePath(path: string): boolean {
  * @returns `true` if `path` is relative, otherwise `false`
  */
 export function isRelativePath(path: string): boolean {
-  return /^\.?\.\//.test(path);
+  return /^\.?\.[/\\]/.test(path);
 }
diff --git a/src/utils/sourcemap-utils.ts b/src/utils/sourcemap-utils.ts
@@ -109,13 +109,9 @@ export class MapModifier {
   relative(dir: string = process.cwd()): this {
     if (this.map.sources) {
       this.map.sources = this.map.sources.map(source => {
-        if (isAbsolutePath(source)) {
-          return relativePath(dir, source);
-        } else if (isRelativePath(source)) {
-          return relativePath(path.dirname(path.join(dir, source)), source);
-        } else {
-          return normalizePath(source);
-        }
+        if (isAbsolutePath(source)) return relativePath(dir, source);
+        else if (isRelativePath(source)) return relativePath(dir, path.join(dir, source));
+        else return normalizePath(source);
       });
     }
     return this;

diff --git a/test/utils.test.ts b/test/utils.test.ts
@@ -1,6 +1,5 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
 import loadModule from "../src/utils/load-module";
-import { normalizePath } from "../src/utils/path-utils";
 import { getInlineMap, getExtractedMap, stripMap, MapModifier } from "../src/utils/sourcemap-utils";
 import path from "path";
 
@@ -33,12 +32,7 @@ test("strip map", () => {
 });
 
 test("map modifier", () => {
-  const map = JSON.stringify({
-    sources: [
-      normalizePath(path.join(process.cwd(), "..", "foo")),
-      normalizePath(path.join(process.cwd(), "..", "bar")),
-    ],
-  });
+  const map = JSON.stringify({ sources: ["../a/b/../foo/bar.css", "../b/a/../bar/foo.css"] });
   const relativeSrc = JSON.stringify(new MapModifier(map).relative().toObject().sources);
-  expect(relativeSrc).toBe(JSON.stringify(["../foo", "../bar"]));
+  expect(relativeSrc).toBe(JSON.stringify(["../a/foo/bar.css", "../b/bar/foo.css"]));
 });