Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

v6.11.0. Improvement.

- v6.11.0 October 29, 2012
	- Updated [QueryEngine](https://github.com/bevry/query-engine/)
dependency from 1.3.x to 1.4.x
		- Should see speed improvements
	- Added `docs` directory to `.npmignore`
  • Loading branch information...
commit a4c3407add2244482f540bad3a7b7d2b1b4cf20b 1 parent d5ba4a0
@balupton balupton authored
View
1  .npmignore
@@ -1,6 +1,7 @@
.travis*
Makefile
+docs/
src/
out/test/
test/
View
7 History.md
@@ -1,8 +1,13 @@
## History
+- v6.11.0 October 29, 2012
+ - Updated [QueryEngine](https://github.com/bevry/query-engine/) dependency from 1.3.x to 1.4.x
+ - Should see speed improvements
+ - Added `docs` directory to `.npmignore`
+
- v6.10.0 October 29, 2012
- Updated [QueryEngine](https://github.com/bevry/query-engine/) dependency from 1.2.3 to 1.3.x
- - Should see better memory usage and massive speed improvements
+ - Should see better memory usage and speed improvements
- Now tells you how many files we have when doing a complete render
- v6.9.2 October 26, 2012
View
4 package.json
@@ -1,6 +1,6 @@
{
"name": "docpad",
- "version": "6.10.0",
+ "version": "6.11.0",
"description": "DocPad is a language agnostic document management system. This means you write your website as documents, in whatever language you wish, and DocPad will handle the compiling, templates and layouts for you. For static documents it will generate static files, for dynamic documents it'll re-render them on each request. You can utilise DocPad by itself, or use it as a module your own custom system. It's pretty cool, and well worth checking out. We love it.",
"homepage": "https://github.com/bevry/docpad",
"keywords": [
@@ -66,7 +66,7 @@
"express": "3.0.x",
"growl": "1.4.x",
"mime": "1.2.x",
- "query-engine": "1.3.x",
+ "query-engine": "1.4.x",
"semver": "1.0.x",
"request": "2.11.x",
"underscore": "1.4.x",
View
12 src/lib/docpad.coffee
@@ -2963,30 +2963,30 @@ class DocPad extends EventEmitterEnhanced
return next(err) if err
# DocPad Header Middleware
- # Keep it before the serverExtend event
+ # Keep it after the serverExtend event
serverExpress.use(docpad.serverMiddlewareHeader)
# Router Middleware
- # Keep it before the serverExtend event
+ # Keep it after the serverExtend event
serverExpress.use(serverExpress.router) if opts.middlewareExpressRouter isnt false
# DocPad Router Middleware
- # Keep it before the serverExtend event
+ # Keep it after the serverExtend event
serverExpress.use(docpad.serverMiddlewareRouter)
# Static
- # Keep it before the serverExtend event
+ # Keep it after the serverExtend event
if config.maxAge
serverExpress.use(express.static(config.outPath,{maxAge:config.maxAge}))
else
serverExpress.use(express.static(config.outPath))
# DocPad 404 Middleware
- # Keep it before the serverExtend event
+ # Keep it after the serverExtend event
serverExpress.use(docpad.serverMiddleware404) if opts.middleware404 isnt false
# DocPad 500 Middleware
- # Keep it before the serverExtend event
+ # Keep it after the serverExtend event
serverExpress.error(docpad.serverMiddleware500) if opts.middleware500 isnt false
# Start the Server
View
3  test/out-expected/multiple-renders.html
@@ -0,0 +1,3 @@
+<blockquote>
+<p>Hello this is <em>markdown</em></p>
+</blockquote>
View
1  test/src/documents/multiple-renders.html.md.eco
@@ -0,0 +1 @@
+> Hello this is <%- '*markdown*' %>
Please sign in to comment.
Something went wrong with that request. Please try again.