From ae77ea807f5e6bbedbd22ad282db9f62587db4e8 Mon Sep 17 00:00:00 2001 From: Sebastian McKenzie Date: Fri, 15 May 2015 00:05:11 +0100 Subject: [PATCH] normalise source map file paths when using the CLI - fixes #1496 --- packages/babel-cli/bin/babel/dir.js | 3 ++- packages/babel-cli/bin/babel/file.js | 6 ++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/packages/babel-cli/bin/babel/dir.js b/packages/babel-cli/bin/babel/dir.js index c78a190939..780ac71958 100644 --- a/packages/babel-cli/bin/babel/dir.js +++ b/packages/babel-cli/bin/babel/dir.js @@ -1,5 +1,6 @@ var outputFileSync = require("output-file-sync"); var chokidar = require("chokidar"); +var slash = require("slash"); var path = require("path"); var util = require("./util"); var fs = require("fs"); @@ -13,7 +14,7 @@ module.exports = function (commander, filenames, opts) { var dest = path.join(commander.outDir, relative); var data = util.compile(src, { - sourceFileName: path.relative(dest + "/..", src) + sourceFileName: slash(path.relative(dest + "/..", src)) }); if (commander.sourceMaps && commander.sourceMaps !== "inline") { diff --git a/packages/babel-cli/bin/babel/file.js b/packages/babel-cli/bin/babel/file.js index 2b4a8ed8ac..0764db9908 100644 --- a/packages/babel-cli/bin/babel/file.js +++ b/packages/babel-cli/bin/babel/file.js @@ -1,6 +1,7 @@ var convertSourceMap = require("convert-source-map"); var sourceMap = require("source-map"); var chokidar = require("chokidar"); +var slash = require("slash"); var path = require("path"); var util = require("./util"); var fs = require("fs"); @@ -15,7 +16,7 @@ module.exports = function (commander, filenames, opts) { var buildResult = function () { var map = new sourceMap.SourceMapGenerator({ - file: commander.outFile || "stdout" + file: slash(commander.outFile || "stdout") }); var code = ""; @@ -27,11 +28,12 @@ module.exports = function (commander, filenames, opts) { if (result.map) { var consumer = new sourceMap.SourceMapConsumer(result.map); - var sourceFilename = filename; + var sourceFilename = filename; if (commander.outFile) { sourceFilename = path.relative(path.dirname(commander.outFile), sourceFilename); } + sourceFilename = slash(sourceFilename); map._sources.add(sourceFilename); map.setSourceContent(sourceFilename, result.actual);