Merge branch 'master' of https://github.com/dcodeIO/ClosureCompiler.js

dcodeIO · dcodeIO · commit 32a8b58bada4 · 2016-04-20T00:29:09.000+02:00
diff --git a/ClosureCompiler.js b/ClosureCompiler.js
@@ -21,7 +21,7 @@
  */
 (function(global) {
     
-    if ((typeof window != 'undefined' && !!window.window) || typeof require != 'function') {
+    if (typeof require != 'function' || !module || !module.exports || !process) {
         throw(new Error("ClosureCompiler.js can only be used within node.js"));
     }
 
@@ -175,14 +175,18 @@
             files = [files];
         }
         for (i=0; i<files.length; i++) {
-            if (typeof files[i] != 'string' || files[i].indexOf('"') >= 0) {
+            if (typeof files[i] != 'string') {
                 throw(new Error("Illegal source file: "+files[i]));
             }
-            stat = fs.statSync(files[i]);
-            if (!stat.isFile()) {
-                throw(new Error("Source file not found: "+files[i]));
+            if (files[i].indexOf('"') >= 0) {
+                args.push('--js=' + files[i]);
+            } else {
+                stat = fs.statSync(files[i]);
+                if (!stat.isFile()) {
+                    throw (new Error("Source file not found: " + files[i]));
+                }
+                args.push('--js', files[i]);
             }
-            args.push('--js', files[i]);
         }
         
         // Externs files
@@ -265,6 +269,9 @@
               }
               callback(err, stdout, stderr);
             });
+            process.on('error', function (err) {
+              callback(err, stdout, stderr);
+            });
         }
 
         // Run it

Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@`
`21`	`21`	`*/`
`22`	`22`	`(function(global) {`
`23`	`23`
`24`		`- if ((typeof window != 'undefined' && !!window.window) \|\| typeof require != 'function') {`
	`24`	`+ if (typeof require != 'function' \|\| !module \|\| !module.exports \|\| !process) {`
`25`	`25`	`throw(new Error("ClosureCompiler.js can only be used within node.js"));`
`26`	`26`	`}`
`27`	`27`
`@@ -175,14 +175,18 @@`
`175`	`175`	`files = [files];`
`176`	`176`	`}`
`177`	`177`	`for (i=0; i<files.length; i++) {`
`178`		`- if (typeof files[i] != 'string' \|\| files[i].indexOf('"') >= 0) {`
	`178`	`+ if (typeof files[i] != 'string') {`
`179`	`179`	`throw(new Error("Illegal source file: "+files[i]));`
`180`	`180`	`}`
`181`		`- stat = fs.statSync(files[i]);`
`182`		`- if (!stat.isFile()) {`
`183`		`- throw(new Error("Source file not found: "+files[i]));`
	`181`	`+ if (files[i].indexOf('"') >= 0) {`
	`182`	`+ args.push('--js=' + files[i]);`
	`183`	`+ } else {`
	`184`	`+ stat = fs.statSync(files[i]);`
	`185`	`+ if (!stat.isFile()) {`
	`186`	`+ throw (new Error("Source file not found: " + files[i]));`
	`187`	`+ }`
	`188`	`+ args.push('--js', files[i]);`
`184`	`189`	`}`
`185`		`- args.push('--js', files[i]);`
`186`	`190`	`}`
`187`	`191`
`188`	`192`	`// Externs files`
`@@ -265,6 +269,9 @@`
`265`	`269`	`}`
`266`	`270`	`callback(err, stdout, stderr);`
`267`	`271`	`});`
	`272`	`+ process.on('error', function (err) {`
	`273`	`+ callback(err, stdout, stderr);`
	`274`	`+ });`
`268`	`275`	`}`
`269`	`276`
`270`	`277`	`// Run it`