Merge branch 'master' of github.com:6to5/6to5

bin/babel/file.js

@@ -1,6 +1,6 @@
+var sourceMapToComment = require("source-map-to-comment");
 var sourceMap          = require("source-map");
 var chokidar           = require("chokidar");
-var util2     = require("../../lib/babel/util");
 var path               = require("path");
 var util               = require("./util");
 var fs                 = require("fs");
@@ -42,7 +42,7 @@ module.exports = function (commander, filenames) {
     });
 
     if (commander.sourceMapsInline || (!commander.outFile && commander.sourceMaps)) {
-      code += "\n" + util2.sourceMapToComment(map);
+      code += "\n" + sourceMapToComment(map);
     }
 
     return {

lib/babel/transformation/file.js

@@ -4,6 +4,7 @@ module.exports = File;
 
 var SHEBANG_REGEX = /^\#\!.*/;
 
+var sourceMapToComment = require("source-map-to-comment");
 var isFunction         = require("lodash/lang/isFunction");
 var transform          = require("./index");
 var generate           = require("../generation");
@@ -454,7 +455,7 @@ File.prototype.generate = function () {
   }
 
   if (opts.sourceMap === "inline") {
-    result.code += "\n" + util.sourceMapToComment(result.map);
+    result.code += "\n" + sourceMapToComment(result.map);
     result.map = null;
   }
 

lib/babel/util.js

@@ -76,12 +76,6 @@ exports.isAbsolute = function (loc) {
   return false;
 };
 
-exports.sourceMapToComment = function (map) {
-  var json = JSON.stringify(map);
-  var base64 = new Buffer(json).toString("base64");
-  return "//# sourceMappingURL=data:application/json;base64," + base64;
-};
-
 var templateVisitor = {
   enter: function (node, parent, scope, nodes) {
     if (t.isExpressionStatement(node)) {

package.json

@@ -58,7 +58,8 @@
     "regenerator-babel": "0.8.10-2",
     "regexpu": "^1.1.1",
     "source-map": "^0.1.43",
-    "source-map-support": "^0.2.9"
+    "source-map-support": "^0.2.9",
+    "source-map-to-comment": "^1.0.0"
   },
   "devDependencies": {
     "browserify": "^8.1.3",