This commit is contained in:
+14
-6
@@ -1,15 +1,16 @@
|
||||
var mdeps = require("module-deps"),
|
||||
through = require("through"),
|
||||
async = require("async"),
|
||||
//uglify = require("uglify-js"),
|
||||
builtins = require("builtins");
|
||||
|
||||
var _log = require("./log");
|
||||
|
||||
function bundle (input, complete) {
|
||||
|
||||
async.waterfall([
|
||||
|
||||
/**
|
||||
* first we resolve all of the deps
|
||||
*/
|
||||
|
||||
function resolveDeps (next) {
|
||||
@@ -39,9 +40,9 @@ function bundle (input, complete) {
|
||||
function end() {
|
||||
var content = buffer.join("");
|
||||
// console.log(content);
|
||||
|
||||
|
||||
/*var source = uglify.parse(content, {
|
||||
/*
|
||||
// TODO add uglify flag
|
||||
var source = uglify.parse(content, {
|
||||
strict: false
|
||||
});
|
||||
source.figure_out_scope();
|
||||
@@ -63,8 +64,15 @@ function bundle (input, complete) {
|
||||
if (id == 'nexeres') { return false; } //treat our new moudle as a builtin module
|
||||
return !~builtins.indexOf(id);
|
||||
},
|
||||
extensions: ['.js', '.json' ]
|
||||
extensions: ['.js', '.json' ],
|
||||
ignoreMissing: true
|
||||
});
|
||||
|
||||
/** event for missing packages, fixes conditional requires **/
|
||||
md.on('missing', function(id, parent) {
|
||||
_log("warn", "couldn't find require '"+id+"', errors may occur.");
|
||||
});
|
||||
|
||||
md.pipe(through(function (chunk) {
|
||||
deps.push(chunk);
|
||||
}, function () {
|
||||
@@ -82,7 +90,7 @@ function bundle (input, complete) {
|
||||
for (var i = deps.length; i--;) {
|
||||
var dep = deps[i];
|
||||
|
||||
var req = "function (require, module, exports, __dirname) { \n"
|
||||
var req = "function (require, module, exports, __dirname) { \n"
|
||||
if (dep.id.toLowerCase().indexOf(".json", dep.id.length - 5) !== -1) {
|
||||
//this is the result of require("someFile.json"), so we need to export it from the function
|
||||
req += "module.exports = "
|
||||
|
||||
Reference in New Issue
Block a user