Merge pull request #10 from thomasjo/bump-packages

Upgrade packages that use old versions of graceful-fs

package.json

@@ -27,19 +27,19 @@
     }
   ],
   "dependencies": {
-    "less": "^1.7.5",
+    "fs-plus": "2.x",
+    "less": "^2.7.1",
     "underscore-plus": "1.x",
-    "walkdir": "0.0.7",
-    "fs-plus": "2.x"
+    "walkdir": "0.0.11"
   },
   "devDependencies": {
+    "fstream": "^1.0.10",
+    "grunt": "^1.0.1",
+    "grunt-cli": "^1.2.0",
+    "grunt-coffeelint": "0.0.16",
+    "grunt-contrib-coffee": "^1.0.0",
+    "grunt-shell": "^1.3.0",
     "jasmine-focused": "1.x",
-    "tmp": "0.0.21",
-    "fstream": "~0.1.24",
-    "grunt-contrib-coffee": "~0.9.0",
-    "grunt-cli": "~0.1.9",
-    "grunt": "~0.4.1",
-    "grunt-shell": "~0.3.1",
-    "grunt-coffeelint": "0.0.7"
+    "tmp": "0.0.28"
   }
 }

src/less-cache.coffee

@@ -3,8 +3,8 @@ crypto = require 'crypto'
 
 _ = require 'underscore-plus'
 fs = require 'fs-plus'
+less = null # Defer until it is actually used
 lessFs = null # Defer until it is actually used
-Parser = null # Defer until it is actually used
 walkdir = require('walkdir').sync
 
 cacheVersion = 1
@@ -85,7 +85,7 @@ class LessCache
 
   observeImportedFilePaths: (callback) ->
     importedPaths = []
-    lessFs ?= require 'less/lib/less/fs.js'
+    lessFs ?= require 'less/lib/less-node/fs.js'
     originalFsReadFileSync = lessFs.readFileSync
     lessFs.readFileSync = (filePath, args...) =>
       content = originalFsReadFileSync(filePath, args...)
@@ -157,17 +157,16 @@ class LessCache
     if @syncCaches and @importsFallbackDir?
       @writeJson(@getCachePath(@importsFallbackDir, filePath), cacheEntry)
 
-  parseLess: (filePath, less) ->
+  parseLess: (filePath, contents) ->
     css = null
     options = filename: filePath, syncImport: true, paths: @importPaths
-    Parser ?= require('less').Parser
-    parser = new Parser(options)
-    imports = @observeImportedFilePaths =>
-      parser.parse less, (error, tree) =>
+    less ?= require('less')
+    imports = @observeImportedFilePaths ->
+      less.render contents, options, (error, result) ->
         if error?
           throw error
         else
-          css = tree.toCSS()
+          {css} = result
     {imports, css}
 
   # Read the Less file at the current path and return either the cached CSS or the newly