fix for #320 #333 Node.js 0.5+ removes require.paths array

benchmark/less-benchmark.js

@@ -2,9 +2,7 @@ var path = require('path'),
     fs = require('fs'),
     sys = require('sys');
 
-require.paths.unshift(__dirname, path.join(__dirname, '..'));
-
-var less = require('lib/less');
+var less = require('../lib/less');
 var file = path.join(__dirname, 'benchmark.less');
 
 if (process.argv[2]) { file = path.join(process.cwd(), process.argv[2]) }

bin/lessc

@@ -4,8 +4,6 @@ var path = require('path'),
     fs = require('fs'),
     sys = require('sys');
 
-require.paths.unshift(path.join(__dirname, '..', 'lib'));
-
 var less = require('less');
 var args = process.argv.slice(1);
 var options = {

lib/less/browser.js

@@ -51,7 +51,6 @@ if (less.env === 'development') {
 }
 
 var cache;
-
 try {
     cache = (typeof(window.localStorage) === 'undefined') ? null : window.localStorage;
 } catch (_) {

lib/less/functions.js

@@ -182,4 +182,4 @@ function clamp(val) {
     return Math.min(1, Math.max(0, val));
 }
 
-})(require('less/tree'));
+})(require('./tree'));

lib/less/index.js

@@ -2,21 +2,19 @@ var path = require('path'),
     sys = require('sys'),
     fs = require('fs');
 
-require.paths.unshift(path.join(__dirname, '..'));
-
 var less = {
     version: [1, 1, 3],
-    Parser: require('less/parser').Parser,
-    importer: require('less/parser').importer,
-    tree: require('less/tree'),
+    Parser: require('./parser').Parser,
+    importer: require('./parser').importer,
+    tree: require('./tree'),
     render: function (input, options, callback) {
         options = options || {};
 
         if (typeof(options) === 'function') {
             callback = options, options = {};
         }
 
-        var parser = new(this.Parser)(options),
+        var parser = new(less.Parser)(options),
             ee;
 
         if (callback) {
@@ -81,7 +79,7 @@ var less = {
  'call',     'url',       'alpha',      'import',
  'mixin',    'comment',   'anonymous',  'value', 'javascript'
 ].forEach(function (n) {
-    require(path.join('less', 'tree', n));
+    require('./tree/'+ n);
 });
 
 less.Parser.importer = function (file, paths, callback) {
@@ -117,7 +115,7 @@ less.Parser.importer = function (file, paths, callback) {
     }
 }
 
-require('less/functions');
+require('./functions');
 
 for (var k in less) { exports[k] = less[k] }
 

lib/less/parser.js

@@ -2,7 +2,7 @@ var less, tree;
 
 if (typeof(window) === 'undefined') {
     less = exports,
-    tree = require('less/tree');
+    tree = require('./tree');
 } else {
     if (typeof(window.less) === 'undefined') { window.less = {} }
     less = window.less,

lib/less/tree.js

@@ -1,10 +1,10 @@
-require('less/tree').find = function (obj, fun) {
+require('./tree').find = function (obj, fun) {
     for (var i = 0, r; i < obj.length; i++) {
         if (r = fun.call(obj, obj[i])) { return r }
     }
     return null;
 };
-require('less/tree').jsify = function (obj) {
+require('./tree').jsify = function (obj) {
     if (Array.isArray(obj.value) && (obj.value.length > 1)) {
         return '[' + obj.value.map(function (v) { return v.toCSS(false) }).join(', ') + ']';
     } else {

lib/less/tree/alpha.js

@@ -14,4 +14,4 @@ tree.Alpha.prototype = {
     }
 };
 
-})(require('less/tree'));
+})(require('../tree'));

lib/less/tree/anonymous.js

@@ -10,4 +10,4 @@ tree.Anonymous.prototype = {
     eval: function () { return this }
 };
 
-})(require('less/tree'));
+})(require('../tree'));

lib/less/tree/call.js

@@ -42,4 +42,4 @@ tree.Call.prototype = {
     }
 };
 
-})(require('less/tree'));
+})(require('../tree'));

lib/less/tree/color.js

@@ -98,4 +98,4 @@ tree.Color.prototype = {
 };
 
 
-})(require('less/tree'));
+})(require('../tree'));

lib/less/tree/comment.js

@@ -11,4 +11,4 @@ tree.Comment.prototype = {
     eval: function () { return this }
 };
 
-})(require('less/tree'));
+})(require('../tree'));

lib/less/tree/dimension.js

@@ -31,4 +31,4 @@ tree.Dimension.prototype = {
     }
 };
 
-})(require('less/tree'));
+})(require('../tree'));

lib/less/tree/directive.js

@@ -30,4 +30,4 @@ tree.Directive.prototype = {
     rulesets: function () { return tree.Ruleset.prototype.rulesets.apply(this.ruleset) }
 };
 
-})(require('less/tree'));
+})(require('../tree'));

lib/less/tree/element.js

@@ -32,4 +32,4 @@ tree.Combinator.prototype.toCSS = function (env) {
     }[this.value];
 };
 
-})(require('less/tree'));
+})(require('../tree'));

lib/less/tree/expression.js

@@ -20,4 +20,4 @@ tree.Expression.prototype = {
     }
 };
 
-})(require('less/tree'));
+})(require('../tree'));

lib/less/tree/import.js

@@ -74,4 +74,4 @@ tree.Import.prototype = {
     }
 };
 
-})(require('less/tree'));
+})(require('../tree'));

lib/less/tree/javascript.js

@@ -47,5 +47,5 @@ tree.JavaScript.prototype = {
     }
 };
 
-})(require('less/tree'));
+})(require('../tree'));
 

lib/less/tree/keyword.js

@@ -6,4 +6,4 @@ tree.Keyword.prototype = {
     toCSS: function () { return this.value }
 };
 
-})(require('less/tree'));
+})(require('../tree'));

lib/less/tree/mixin.js

@@ -103,4 +103,4 @@ tree.mixin.Definition.prototype = {
     }
 };
 
-})(require('less/tree'));
+})(require('../tree'));

lib/less/tree/operation.js

@@ -29,4 +29,4 @@ tree.operate = function (op, a, b) {
     }
 };
 
-})(require('less/tree'));
+})(require('../tree'));

lib/less/tree/quoted.js

@@ -26,4 +26,4 @@ tree.Quoted.prototype = {
     }
 };
 
-})(require('less/tree'));
+})(require('../tree'));

lib/less/tree/rule.js

@@ -35,4 +35,4 @@ tree.Shorthand.prototype = {
     eval: function () { return this }
 };
 
-})(require('less/tree'));
+})(require('../tree'));

lib/less/tree/ruleset.js

@@ -209,4 +209,4 @@ tree.Ruleset.prototype = {
         }
     }
 };
-})(require('less/tree'));
+})(require('../tree'));

lib/less/tree/selector.js

@@ -39,4 +39,4 @@ tree.Selector.prototype.toCSS = function (env) {
     }).join('');
 };
 
-})(require('less/tree'));
+})(require('../tree'));

lib/less/tree/url.js

@@ -22,4 +22,4 @@ tree.URL.prototype = {
     }
 };
 
-})(require('less/tree'));
+})(require('../tree'));

lib/less/tree/value.js

@@ -21,4 +21,4 @@ tree.Value.prototype = {
     }
 };
 
-})(require('less/tree'));
+})(require('../tree'));

lib/less/tree/variable.js

@@ -21,4 +21,4 @@ tree.Variable.prototype = {
     }
 };
 
-})(require('less/tree'));
+})(require('../tree'));

test/less-test.js

@@ -2,9 +2,7 @@ var path = require('path'),
     fs = require('fs'),
     sys = require('sys');
 
-require.paths.unshift(__dirname, path.join(__dirname, '..'));
-
-var less = require('lib/less');
+var less = require('../lib/less');
 
 less.tree.functions.add = function (a, b) {
     return new(less.tree.Dimension)(a.value + b.value);