Skip to content

Commit

Permalink
Merge branch 'feature/free-metalsmith-unexpected-markdown'
Browse files Browse the repository at this point in the history
  • Loading branch information
sunesimonsen committed May 2, 2015
2 parents 9a134a2 + b26a33d commit 3fb6087
Show file tree
Hide file tree
Showing 7 changed files with 15 additions and 611 deletions.
2 changes: 1 addition & 1 deletion Makefile
Expand Up @@ -80,4 +80,4 @@ site-build:

.PHONY: update-examples
update-examples:
node site/update-examples.js
node site/build.js --update-examples
9 changes: 5 additions & 4 deletions package.json
Expand Up @@ -37,8 +37,6 @@
"glob": "4.3.2",
"istanbul": "0.3.5",
"jshint": "2.5.6",
"magicpen-prism": "1.1.1",
"marked": "^0.3.3",
"metalsmith": "1.0.1",
"metalsmith-autoprefixer": "1.0.1",
"metalsmith-collections": "0.6.0",
Expand All @@ -47,13 +45,16 @@
"metalsmith-permalinks": "0.4.0",
"metalsmith-static": "0.0.5",
"metalsmith-templates": "0.6.0",
"minimatch": "2.0.1",
"metalsmith-unexpected-markdown": "1.0.0",
"minimatch": "2.0.7",
"minimist": "1.1.1",
"mocha": "2.1.0",
"mocha-phantomjs": "3.5.3",
"mocha-slow-reporter": "*",
"passerror": "1.1.0",
"phantomjs": "1.9.15",
"serve": "*",
"stat-mode": "0.2.0"
"stat-mode": "0.2.0",
"unexpected": "7.0.4"
}
}
11 changes: 9 additions & 2 deletions site/build.js
@@ -1,5 +1,8 @@
/*global __dirname*/
var metalSmith = require('metalsmith');
var expect = require('../lib/');
var path = require('path');
var argv = require('minimist')(process.argv.slice(2));

function idToName(id) {
return id.replace(/-/g, ' ');
Expand Down Expand Up @@ -93,7 +96,7 @@ metalSmith(__dirname)
pattern: '*.md'
}
}))
.use(require('./lib/include-static-assets')({ path: require('path').resolve(__dirname, 'static') }))
.use(require('./lib/include-static-assets')({ path: path.resolve(__dirname, 'static') }))
// Dynamicly generate metadata for assertion files
.use(function (files, metalsmith, next) {
Object.keys(files).filter(function (file) {
Expand Down Expand Up @@ -175,7 +178,11 @@ metalSmith(__dirname)
files['searchIndex.json'] = { contents: JSON.stringify(indexData, null, 2) };
next();
})
.use(require('./metalsmith-unexpected-markdown')())
.use(require('metalsmith-unexpected-markdown')({
unexpected: require('../lib/'),
testFile: path.resolve(__dirname, '..', 'test', 'documentation.spec.js'),
updateExamples: 'update-examples' in argv
}))
// permalinks with no options will just make pretty urls...
.use(require('metalsmith-permalinks')({ relative: false }))
.use(function (files, metalsmith, next) {
Expand Down
25 changes: 0 additions & 25 deletions site/magicpen-dark-syntax-theme.js

This file was deleted.

34 changes: 0 additions & 34 deletions site/magicpen-github-syntax-theme.js

This file was deleted.

0 comments on commit 3fb6087

Please sign in to comment.