For parse.usesCommonJs(), check for __filename and __dirname usage.

jrburke · jrburke · commit 84bb5c2a0f86 · 2012-01-31T14:20:15.000-08:00
diff --git a/build/jslib/parse.js b/build/jslib/parse.js
@@ -471,8 +471,9 @@ define(['./uglifyjs/index'], function (uglify) {
 
 
     /**
-     * Determines if require(''), exports.x =, and/or module.exports =
-     * are used.
+     * Determines if require(''), exports.x =, module.exports =,
+     * __dirname, __filename are used. So, not strictly traditional CommonJS,
+     * also checks for Node variants.
      */
     parse.usesCommonJs = function (fileName, fileContents, options) {
         var uses = null,
@@ -490,13 +491,15 @@ define(['./uglifyjs/index'], function (uglify) {
             }
         }, options, function (node, onMatch) {
 
-            var call, configNode, args;
+            var call, args;
 
             if (!isArray(node)) {
                 return false;
             }
 
-            if (node[0] === 'var' && node[1] && node[1][0] && node[1][0][0] === 'exports') {
+            if (node[0] === 'name' && (node[1] === '__dirname' || node[1] === '__filename')) {
+                return onMatch(node[1].substring(2));
+            } else if (node[0] === 'var' && node[1] && node[1][0] && node[1][0][0] === 'exports') {
                 //Hmm, a variable assignment for exports, so does not use cjs exports.
                 return onMatch('varExports');
             } else if (node[0] === 'assign' && node[2][0] === 'dot') {
diff --git a/build/tests/parse.js b/build/tests/parse.js
@@ -157,6 +157,8 @@ define(['parse', 'env!env/file'], function (parse, file) {
                     good2 = "something(); exports.foo = another();",
                     good3 = "(function () { module.exports = function () {}; }());",
                     good4 = "var a = require('a'); something(); exports.b = a;",
+                    good5 = "exports.foo = function () { return something(__dirname); };",
+                    good6 = "var foo = 'bar', path = __filename;",
 
                     bad1 = "(function(){ if (typeof define === 'function' && define.amd) { define(['some'], function (some) {}) } }());",
                     bad2 = "require(['something']);",
@@ -173,6 +175,17 @@ define(['parse', 'env!env/file'], function (parse, file) {
                 t.is(true, result.exports);
                 t.is(false, !!result.moduleExports);
 
+                result = parse.usesCommonJs("good5", good5);
+                t.is(false, !!result.require);
+                t.is(true, result.exports);
+                t.is(true, result.dirname);
+
+                result = parse.usesCommonJs("good6", good6);
+                t.is(true, result.filename);
+                t.is(false, !!result.exports);
+                t.is(false, !!result.moduleExports);
+
+
                 t.is(null, parse.usesCommonJs("bad1", bad1));
                 t.is(null, parse.usesCommonJs("bad2", bad2));
                 t.is(null, parse.usesCommonJs("bad3", bad3));
