Permalink
Browse files

Fixes #107, #111, #106, #110. Prep for v2.5.0 release.

  • Loading branch information...
1 parent 45d9f6c commit 9319de4fe4355266d60a9209dbb2581fc98bf67d @balupton balupton committed Dec 15, 2011
View
@@ -188,6 +188,28 @@ _Getting errors? [Try troubleshooting](https://github.com/balupton/docpad/wiki/T
## History
+- v2.5 December 15, 2011
+ - Swapped out [Dominic Baggott's](https://github.com/evilstreak) [Markdown.js](http://github.com/evilstreak/markdown-js) for [Isaac Z. Schlueter's](https://github.com/isaacs) [Github-Flavored-Markdown](https://github.com/isaacs/github-flavored-markdown)
+ - Now adds support for inline html in markdown files
+ - Closes #107
+ - Fixed plugins installing on windows
+ - Had to upgrade NPM from 1.0.x to 1.1.x
+ - Closes #111
+ - Fixed the error: `Object #<Object> has no method 'error'`
+ - Fixes #106
+ - Fixed `html2jade` on windows
+ - Closes #110
+ - Can now pass over options to the coffeekup renderer inside the coffee plugin
+ - E.g. set `docpad: plugins: coffee: coffeekup: format: true` to have tidy html output
+ - Thanks to [Changwoo Park](https://github.com/pismute)
+ - Updated depdencies
+ - Commander 0.3.x -> 0.5.x [- changelog](https://github.com/visionmedia/commander.js/blob/master/History.md)
+ - Growl 1.1.x -> 1.2.x [- changelog](https://github.com/visionmedia/node-growl/blob/master/History.md)
+ - NPM 1.0.x -> 1.1.x
+ - Jade 0.17.x -> 0.19.x [- changelog](https://github.com/visionmedia/jade/blob/master/History.md)
+ - Stylus 0.19.x -> 0.20.x [- changelog](https://github.com/LearnBoost/stylus/blob/master/History.md)
+ - Nib 0.2.x -> 0.3.x [- changelog](https://github.com/visionmedia/nib/blob/master/History.md)
+
- v2.4 November 26, 2011
- AutoUpdate plugin
- Automatically refreshes the user's current page when the website is regenerated
@@ -19,7 +19,7 @@ class CoffeePlugin extends DocpadPlugin
# CoffeeKup to anything
if inExtension in ['coffeekup','ck'] or (inExtension is 'coffee' and !(outExtension in ['js','css']))
ck = require 'coffeekup' unless ck
- file.content = ck.render file.content, templateData
+ file.content = ck.render file.content, templateData, (@config.coffeekup or {})
next()
# HTML to CoffeeKup
@@ -57,5 +57,12 @@
"directories": {
"lib": "."
},
- "main": "./coffee.plugin.coffee"
+ "main": "./coffee.plugin.coffee",
+ "docpad": {
+ "plugin": {
+ "coffeekup": {
+ "format": false
+ }
+ }
+ }
}
@@ -44,7 +44,7 @@
"url": "http://github.com/balupton/docpad.git"
},
"dependencies": {
- "haml": ">=0.4.x"
+ "haml": "0.4.x"
},
"engines" : {
"node": ">=0.4.0"
@@ -21,7 +21,12 @@ class JadePlugin extends DocpadPlugin
})(templateData)
next()
else if outExtension is 'jade' and inExtension is 'html'
- html2jade = require 'html2jade' unless html2jade
+ try
+ unless html2jade
+ html2jade = require 'html2jade'
+ catch err
+ unless html2jade
+ html2jade = require path.resolve(__dirname, 'node_modules', 'html2jade', 'lib', 'html2jade.coffee')
html2jade.convertHtml file.content, {}, (err,result) ->
return next(err) if err
file.content = result
@@ -44,7 +44,7 @@
"url": "http://github.com/balupton/docpad.git"
},
"dependencies": {
- "jade": "0.17.x",
+ "jade": "0.19.x",
"html2jade": "0.1.x"
},
"engines" : {
@@ -43,8 +43,8 @@
"url": "http://github.com/balupton/docpad.git"
},
"dependencies": {
- "stylus": "0.19.x",
- "nib": "0.2.x"
+ "stylus": "0.20.x",
+ "nib": "0.3.x"
},
"engines" : {
"node": ">=0.4.0"
View
@@ -1,6 +1,6 @@
{
"name": "docpad",
- "version": "2.4.0",
+ "version": "2.5.0",
"description": "DocPad (like Jekyll) is a static website generator, unlike Jekyll it's written in CoffeeScript+Node.js instead of Ruby, and also allows the template engine complete access to the document model. This means you have unlimited power as a CMS and the simplicity of a notepad.",
"homepage": "https://github.com/balupton/docpad",
"keywords": [
@@ -49,13 +49,13 @@
"query-engine": "0.5.x",
"watchr": "0.1.x",
"caterpillar": "0.1.x",
- "commander": "0.3.x",
- "growl": "1.1.x",
+ "commander": "0.5.x",
+ "growl": "1.2.x",
"yaml": "0.2.1",
"coffee-script": "1.1.3",
"js2coffee": "0.1.x",
"underscore": "1.2.x",
- "npm": "1.0.x"
+ "npm": "1.1.x"
},
"engines" : {
"node": ">=0.4.0"

0 comments on commit 9319de4

Please sign in to comment.