Merge pull request #129 from docpress/pug

Swap jade for pug

index.js

@@ -2,7 +2,7 @@
 
 const ware = require('ware')
 const fs = require('fs')
-const jade = require('jade')
+const pug = require('pug')
 const join = require('path').join
 const assign = Object.assign
 
@@ -125,7 +125,7 @@ function addJs (files, ms, done) {
 }
 
 /**
- * Layout jade.
+ * Layout pug.
  * Passes these template options:
  *
  * * `base` — prefix.
@@ -151,9 +151,9 @@ function relayout (files, ms, done) {
   const index = files['_docpress.json'].index
   const meta = ms.metadata()
 
-  const jadeData = fs.readFileSync(join(__dirname, 'data/layout.jade'), 'utf-8')
-  const layout = memoize(['jade', jadeData], () => {
-    return jade.compile(jadeData, { pretty: true })
+  const pugData = fs.readFileSync(join(__dirname, 'data/layout.pug'), 'utf-8')
+  const layout = memoize(['pug', pugData], () => {
+    return pug.compile(pugData, { pretty: true })
   })
 
   eachCons(index, (_, fname, __, prevName, ___, nextName) => {
@@ -170,9 +170,9 @@ function relayout (files, ms, done) {
       active: fname
     }
 
-    const key = [ jadeData, locals, file ]
+    const key = [ pugData, locals, file ]
 
-    file.contents = memoize(['jadedata', key], () => {
+    file.contents = memoize(['pugdata', key], () => {
       return layout(assign({}, file, locals))
     })
   })

package.json

@@ -13,12 +13,12 @@
     "dom101": "1.3.0",
     "github-markdown-css": "2.1.1",
     "iconfonts": "0.8.0",
-    "jade": "1.11.0",
     "normalize.css": "3.0.3",
     "nprogress": "0.2.0",
     "onmount": "1.2.0",
     "pjax": "0.1.4",
     "postcss": "5.0.18",
+    "pug": "^2.0.0-beta5",
     "stylus": "0.54.2",
     "uglifyify": "3.0.1",
     "ware": "1.3.0"

test/fixture/with_anchors_test.js

@@ -21,7 +21,7 @@ describe('fixture/with anchors:', function () {
     })
 
     it('links to anchored versions', function () {
-      expect(data).toInclude('<a href="index.html#two" class="link title  link-index-2">intro 2</a>')
+      expect(data).toInclude('<a class="link title  link-index-2" href="index.html#two">intro 2</a>')
     })
   })
 })

test/mocha.opts

@@ -1,5 +1,5 @@
 --recursive
 --require mocha-clean/brief
 --require test/setup
---watch-extensions=sass,jade,md,css
+--watch-extensions=sass,pug,md,css
 --timeout 10000