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

This commit is contained in:
Sebastian McKenzie 2015-02-17 13:07:35 +11:00
commit 7fc1d04f9b
4 changed files with 24 additions and 28 deletions

View File

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

View File

@ -4,18 +4,19 @@ module.exports = File;
var SHEBANG_REGEX = /^\#\!.*/; var SHEBANG_REGEX = /^\#\!.*/;
var isFunction = require("lodash/lang/isFunction"); var sourceMapToComment = require("source-map-to-comment");
var transform = require("./index"); var isFunction = require("lodash/lang/isFunction");
var generate = require("../generation"); var transform = require("./index");
var defaults = require("lodash/object/defaults"); var generate = require("../generation");
var includes = require("lodash/collection/includes"); var defaults = require("lodash/object/defaults");
var clone = require("../helpers/clone"); var includes = require("lodash/collection/includes");
var parse = require("../helpers/parse"); var clone = require("../helpers/clone");
var Scope = require("../traversal/scope"); var parse = require("../helpers/parse");
var util = require("../util"); var Scope = require("../traversal/scope");
var path = require("path"); var util = require("../util");
var each = require("lodash/collection/each"); var path = require("path");
var t = require("../types"); var each = require("lodash/collection/each");
var t = require("../types");
function File(opts) { function File(opts) {
this.dynamicImportedNoDefault = []; this.dynamicImportedNoDefault = [];
@ -454,7 +455,7 @@ File.prototype.generate = function () {
} }
if (opts.sourceMap === "inline") { if (opts.sourceMap === "inline") {
result.code += "\n" + util.sourceMapToComment(result.map); result.code += "\n" + sourceMapToComment(result.map);
result.map = null; result.map = null;
} }

View File

@ -76,12 +76,6 @@ exports.isAbsolute = function (loc) {
return false; 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 = { var templateVisitor = {
enter: function (node, parent, scope, nodes) { enter: function (node, parent, scope, nodes) {
if (t.isExpressionStatement(node)) { if (t.isExpressionStatement(node)) {

View File

@ -58,7 +58,8 @@
"regenerator-babel": "0.8.10-2", "regenerator-babel": "0.8.10-2",
"regexpu": "^1.1.1", "regexpu": "^1.1.1",
"source-map": "^0.1.43", "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": { "devDependencies": {
"browserify": "^8.1.3", "browserify": "^8.1.3",