Merge remote-tracking branch 'super/master'

Author: Ambroos

.gitignore

@@ -1,3 +1,6 @@
 node_modules
 actual-output
 coverage
+*.log
+yarn.lock
+package-lock.json

.travis.yml

@@ -1,5 +1,5 @@
 language: node_js
 node_js:
-  - "4.1"
+  - "6"
 after_script:
   - npm run coveralls

jest.config.js

@@ -0,0 +1,3 @@
+module.exports = {
+  coveragePathIgnorePatterns: ["/node_modules/", "/test/"]
+}

package.json

@@ -4,8 +4,9 @@
   "description": "Minimal, unopinionated static site generator powered by webpack",
   "main": "index.js",
   "scripts": {
-    "test": "istanbul cover _mocha test -- --timeout 20000",
-    "coveralls": "cat ./coverage/lcov.info | ./node_modules/coveralls/bin/coveralls.js && rm -rf ./coverage"
+    "test": "jest test",
+    "coverage": "jest --coverage",
+    "coveralls": "jest --coverage --coverageReporters=text-lcov | coveralls"
   },
   "repository": {
     "type": "git",
@@ -29,13 +30,14 @@
     "babel-core": "^6.2.1",
     "babel-loader": "^6.2.0",
     "babel-preset-es2015": "^6.1.18",
-    "chai": "^3.4.1",
     "compression-webpack-plugin": "^0.3.1",
-    "coveralls": "^2.11.4",
+    "coveralls": "^3.0.2",
+    "dir-compare": "^1.4.0",
     "ejs": "^2.3.4",
+    "es6-promisify": "^6.0.0",
     "glob": "^7.0.3",
-    "istanbul": "^0.4.1",
-    "mocha": "^3.0.2",
+    "jest": "^23.6.0",
+    "node-dir": "^0.1.17",
     "rimraf": "^2.4.4",
     "webpack": "^1.12.10",
     "webpack-stats-plugin": "^0.1.1"