Merge pull request #125 from devongovett/master

Allow inSourceMap option to be a generated JSON source map

1 files changed, 11 insertions, 10 deletions

diff --git a/tools/node.js b/tools/node.js
index cf87628d..c0dd3dbc 100644
--- a/tools/node.js
+++ b/tools/node.js
@@ -92,17 +92,18 @@ exports.minify = function(files, options) {
     }
 
     // 4. output
-    var map = null;
-    var inMap = null;
-    if (options.inSourceMap) {
+    var inMap = options.inSourceMap;
+    var output = {};
+    if (typeof options.inSourceMap == "string") {
         inMap = fs.readFileSync(options.inSourceMap, "utf8");
     }
-    if (options.outSourceMap) map = UglifyJS.SourceMap({
-        file: options.outSourceMap,
-        orig: inMap,
-        root: options.sourceRoot
-    });
-    var output = { source_map: map };
+    if (options.outSourceMap) {
+        output.source_map = UglifyJS.SourceMap({
+            file: options.outSourceMap,
+            orig: inMap,
+            root: options.sourceRoot
+        });
+    }
     if (options.output) {
         UglifyJS.merge(output, options.output);
     }
@@ -110,7 +111,7 @@ exports.minify = function(files, options) {
     toplevel.print(stream);
     return {
         code : stream + "",
-        map  : map + ""
+        map  : output.source_map + ""
     };
 };