Skip to content
This repository was archived by the owner on Dec 15, 2022. It is now read-only.

Commit ea484ed

Browse files
authored
Merge pull request #17 from aminya/less3
Less 3
2 parents 58765c1 + 9f85e26 commit ea484ed

3 files changed

Lines changed: 28 additions & 55 deletions

File tree

Gruntfile.coffee

Lines changed: 0 additions & 38 deletions
This file was deleted.

package.json

Lines changed: 16 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,11 @@
44
"description": "Less compile cache",
55
"main": "./lib/less-cache",
66
"scripts": {
7-
"prepublish": "grunt clean lint coffee",
8-
"test": "grunt test"
7+
"clean": "shx rm -rf lib",
8+
"test": "jasmine-focused --captureExceptions --coffee spec",
9+
"coffee": "npm run clean && shx cp -r src lib && coffee -c -M -o lib lib && shx rm -rf lib/*.coffee",
10+
"build": "npm run coffee",
11+
"prepare": "npm run build"
912
},
1013
"repository": {
1114
"type": "git",
@@ -27,20 +30,18 @@
2730
}
2831
],
2932
"dependencies": {
30-
"fs-plus": "^3.0.0",
31-
"less": "^2.7.1",
32-
"underscore-plus": "1.x",
33-
"walkdir": "0.0.11"
33+
"fs-plus": "^3.1.1",
34+
"less": "^3.12.2",
35+
"underscore-plus": "^1.7.0",
36+
"walkdir": "^0.4.1"
3437
},
3538
"devDependencies": {
36-
"fstream": "^1.0.10",
37-
"grunt": "^1.0.1",
38-
"grunt-cli": "^1.2.0",
39-
"grunt-coffeelint": "0.0.16",
40-
"grunt-contrib-coffee": "^1.0.0",
41-
"grunt-shell": "^1.3.0",
42-
"jasmine-focused": "1.x",
43-
"temp": "^0.8.3",
44-
"tmp": "0.0.28"
39+
"coffeescript": "^1.12.7",
40+
"fstream": "^1.0.12",
41+
"jasmine-focused": "^1",
42+
"temp": "^0.9.4",
43+
"tmp": "0.2.1",
44+
"shx": "^0.3.3",
45+
"cross-env": "^7.0.3"
4546
}
4647
}

src/less-cache.coffee

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,12 @@ class LessCache
107107

108108
observeImportedFilePaths: (callback) ->
109109
importedPaths = []
110-
lessFs ?= require 'less/lib/less-node/fs.js'
110+
# load or assign less and lessFs
111+
if (less == null)
112+
less = require 'less'
113+
lessFs = less.fs
114+
else if (lessFs == null)
115+
lessFs = less.fs
111116
originalFsReadFileSync = lessFs.readFileSync
112117
lessFs.readFileSync = (filePath, args...) =>
113118
relativeFilePath = @relativize(@resourcePath, filePath) if @resourcePath
@@ -196,7 +201,12 @@ class LessCache
196201
parseLess: (filePath, contents) ->
197202
css = null
198203
options = filename: filePath, syncImport: true, paths: @importPaths
199-
less ?= require('less')
204+
# load or assign less and lessFs
205+
if (less == null)
206+
less = require 'less'
207+
lessFs = less.fs
208+
else if (lessFs == null)
209+
lessFs = less.fs
200210
imports = @observeImportedFilePaths ->
201211
less.render contents, options, (error, result) ->
202212
if error?

0 commit comments

Comments
 (0)