Use cwd-relative path for sourceFileName.

babel · Apr 27, 2018 · cba1ec1 · cba1ec1
1 parent 74c1239
commit cba1ec1
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 4 deletions.
diff --git a/packages/babel-core/src/transformation/normalize-opts.js b/packages/babel-core/src/transformation/normalize-opts.js
@@ -6,15 +6,18 @@ import type { ResolvedConfig } from "../config";
 export default function normalizeOptions(config: ResolvedConfig): {} {
   const {
     filename,
-    filenameRelative = filename || "unknown",
+    cwd,
+    filenameRelative = typeof filename === "string"
+      ? path.relative(cwd, filename)
+      : "unknown",
     sourceType = "module",
     inputSourceMap,
     sourceMaps = !!inputSourceMap,
 
     moduleRoot,
     sourceRoot = moduleRoot,
 
-    sourceFileName = path.basename(filenameRelative),
+    sourceFileName = filenameRelative,
 
     comments = true,
     compact = "auto",
@@ -35,7 +38,7 @@ export default function normalizeOptions(config: ResolvedConfig): {} {
     generatorOpts: Object.assign(
       {
         // General generator flags.
-        filename,
+        filename: filenameRelative,
         auxiliaryCommentBefore: opts.auxiliaryCommentBefore,
         auxiliaryCommentAfter: opts.auxiliaryCommentAfter,
         retainLines: opts.retainLines,

diff --git a/packages/babel-core/test/api.js b/packages/babel-core/test/api.js
@@ -395,10 +395,12 @@ describe("api", function() {
 
   it("default source map filename", function() {
     return transformAsync("var a = 10;", {
+      cwd: "/some/absolute",
       filename: "/some/absolute/file/path.js",
       sourceMaps: true,
     }).then(function(result) {
-      expect(result.map.sources).toEqual(["path.js"]);
+      expect(result.map.sources).toEqual(["file/path.js"]);
+      expect(result.map.file).toEqual("file/path.js");
     });
   });
 

diff --git a/packages/babel-generator/src/source-map.js b/packages/babel-generator/src/source-map.js
@@ -19,6 +19,7 @@ export default class SourceMap {
   get() {
     if (!this._cachedMap) {
       const map = (this._cachedMap = new sourceMap.SourceMapGenerator({
+        file: this._opts.filename,
         sourceRoot: this._opts.sourceRoot,
       }));