Skip to content

Commit

Permalink
Merge branch 'master' into davidchambers/parse-date
Browse files Browse the repository at this point in the history
  • Loading branch information
davidchambers committed Mar 9, 2019
2 parents 9646aa5 + eafdef3 commit 1e59c7c
Show file tree
Hide file tree
Showing 208 changed files with 910 additions and 1,910 deletions.
9 changes: 5 additions & 4 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jobs:
NPM_CONFIG_LOGLEVEL: warn
NPM_CONFIG_PROGRESS: false
NVM_DIR: /home/circleci/.nvm
parallelism: 3
parallelism: 4
steps:
- checkout
- restore_cache:
Expand All @@ -30,7 +30,8 @@ jobs:
nvm exec $1 npm test
}
case $CIRCLE_NODE_INDEX in
0) npm install && npm test && node_modules/.bin/karma start ;;
1) test_with_version 7 ;;
2) test_with_version 8 ;;
0) npm install && npm test ;;
1) test_with_version 8 ;;
2) test_with_version 10 ;;
3) test_with_version 11 ;;
esac
6 changes: 6 additions & 0 deletions .eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,12 @@
"no-extra-semi": ["off"],
"no-unused-vars": ["error", {"args": "none", "varsIgnorePattern": "^([$]|S)$"}]
}
},
{
"files": ["index.js"],
"rules": {
"multiline-comment-style": ["off"]
}
}
]
}
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
/.nyc_output/
/coverage/
/node_modules/
134 changes: 0 additions & 134 deletions karma.conf.js

This file was deleted.

10 changes: 2 additions & 8 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,17 +23,11 @@
"sanctuary-type-identifiers": "2.0.1"
},
"devDependencies": {
"browserify": "16.2.x",
"fantasy-land": "3.5.0",
"fantasy-laws": "1.2.x",
"fantasy-land": "4.0.1",
"jsverify": "0.8.x",
"karma": "2.0.x",
"karma-browserify": "5.2.x",
"karma-mocha": "1.3.x",
"karma-sauce-launcher": "1.2.x",
"sanctuary-descending": "1.1.0",
"sanctuary-identity": "1.1.x",
"sanctuary-scripts": "2.0.x"
"sanctuary-scripts": "3.0.x"
},
"files": [
"/LICENSE",
Expand Down
9 changes: 9 additions & 0 deletions test/.eslintrc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"root": true,
"extends": ["../node_modules/sanctuary-style/eslint-es6.json"],
"env": {"node": true},
"globals": {"suite": false, "test": false},
"rules": {
"max-len": ["off"]
}
}
177 changes: 0 additions & 177 deletions test/Either/Either.js

This file was deleted.

Loading

0 comments on commit 1e59c7c

Please sign in to comment.