Skip to content

Commit

Permalink
Merge a90afd5 into 09001fe
Browse files Browse the repository at this point in the history
  • Loading branch information
jahredhope committed Sep 27, 2018
2 parents 09001fe + a90afd5 commit 89488c0
Show file tree
Hide file tree
Showing 66 changed files with 532 additions and 346 deletions.
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
node_modules
actual-output
coverage
*.log
yarn.lock
package-lock.json
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
language: node_js
node_js:
- "4.1"
- "6"
after_script:
- npm run coveralls
3 changes: 3 additions & 0 deletions jest.config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
module.exports = {
coveragePathIgnorePatterns: ["/node_modules/", "/test/"]
}
14 changes: 8 additions & 6 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -20,6 +21,7 @@
"dependencies": {
"bluebird": "^3.0.5",
"cheerio": "^0.22.0",
"coveralls": "^3.0.2",
"eval": "^0.1.0",
"url": "^0.11.0",
"webpack-sources": "^0.2.0"
Expand All @@ -29,13 +31,13 @@
"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",
"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"
Expand Down

0 comments on commit 89488c0

Please sign in to comment.