diff --git a/package.json b/package.json index 2d142bc..a09d562 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "docpad-plugin-less", - "version": "2.4.1", + "version": "2.5.0", "description": "Adds support for the LESS CSS pre-processor to DocPad", "homepage": "http://docpad.org/plugin/less", "license": { @@ -48,7 +48,7 @@ "node": ">=0.4" }, "dependencies": { - "less": "~1.6.0" + "less": "~2.4.0" }, "peerDependencies": { "docpad": "6" diff --git a/src/less.plugin.coffee b/src/less.plugin.coffee index ef73e4b..e5c40b5 100644 --- a/src/less.plugin.coffee +++ b/src/less.plugin.coffee @@ -38,21 +38,10 @@ module.exports = (BasePlugin) -> file.setMetaDefaults('referencesOthers': true) if opts.content.indexOf('@import') isnt -1 # Parse - new (less.Parser)(parseOptions).parse opts.content, (err,tree) -> - # Check + less.render opts.content, parseOptions, (err, output) -> if err - err = new Error(less.formatError(err, parseOptions)) return next(err) - - # Prepare - compileOptions = - compress: config.compress - - # Extend Compile Options - compileOptions[key] = value for own key,value of config.compileOptions if config.compileOptions - - # Compile - opts.content = tree.toCSS(compileOptions) + opts.content = output.css # Done return next() diff --git a/test/out-expected/include.css b/test/out-expected/include.css new file mode 100644 index 0000000..405c5f1 --- /dev/null +++ b/test/out-expected/include.css @@ -0,0 +1,6 @@ +body strong { + font-weight: bold; +} +body h1 { + background-color: red; +} diff --git a/test/src/documents/include.css.less b/test/src/documents/include.css.less new file mode 100644 index 0000000..56881a2 --- /dev/null +++ b/test/src/documents/include.css.less @@ -0,0 +1,7 @@ +@import "less.css.less"; + +body { + h1 { + background-color: red; + } +}