Skip to content

Commit

Permalink
Merge pull request #4 from robertoachar/develop
Browse files Browse the repository at this point in the history
Develop
  • Loading branch information
robertoachar committed Feb 19, 2018
2 parents 32daccf + a3233c5 commit db00a92
Show file tree
Hide file tree
Showing 24 changed files with 456 additions and 4,690 deletions.
24 changes: 4 additions & 20 deletions .eslintrc
Original file line number Diff line number Diff line change
@@ -1,29 +1,13 @@
{
"extends": "eslint:recommended",
"extends": ["prettier"],
"plugins": ["prettier"],
"env": {
"es6": true,
"jest": true,
"node": true
"es6": true
},
"parserOptions": {
"ecmaVersion": 8
},
"rules": {
"indent": [
"error",
2
],
"linebreak-style": [
"error",
"unix"
],
"quotes": [
"error",
"single"
],
"semi": [
"error",
"always"
]
"prettier/prettier": "error"
}
}
36 changes: 36 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,42 @@
logs
*.log
npm-debug.log*
yarn-debug.log*
yarn-error.log*

# Runtime data
pids
*.pid
*.seed
*.pid.lock

# Directory for instrumented libs generated by jscoverage/JSCover
lib-cov

# Coverage directory used by tools like istanbul
coverage

# nyc test coverage
.nyc_output

# Grunt intermediate storage (http://gruntjs.com/creating-plugins#storing-task-files)
.grunt

# Bower dependency directory (https://bower.io/)
bower_components

# node-waf configuration
.lock-wscript

# Compiled binary addons (https://nodejs.org/api/addons.html)
build/Release

# Dependency directories
node_modules/
jspm_packages/

# Typescript v1 declaration files
typings/

# Optional npm cache directory
.npm
Expand All @@ -20,3 +50,9 @@ node_modules/

# Output of 'npm pack'
*.tgz

# Yarn Integrity file
.yarn-integrity

# dotenv environment variables file
.env
2 changes: 2 additions & 0 deletions .npmrc
Original file line number Diff line number Diff line change
@@ -1 +1,3 @@
package-lock = false
progress = false
save-exact = true
4 changes: 4 additions & 0 deletions .prettierrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"arrowParens": "always",
"singleQuote": true
}
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
language: node_js

node_js:
- "6"
- "8"

install:
- npm install
Expand Down
13 changes: 12 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,19 @@
# Changelog

## 1.0.2

* **build**: remove package-lock
* **build**: remove unused script
* **ci**: update node version
* **docs**: improve usage
* **refactor**: split lib
* **refactor**: update .gitignore
* **style**: add prettier
* **test**: split and improve tests

## 1.0.1

* Fixing npm badge
* **fix**: npm badge

## 1.0.0

Expand Down
24 changes: 11 additions & 13 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -35,12 +35,14 @@ $ npm install --save @robertoachar/whoops
* Import whoops

```javascript
const express = require('express');
const whoops = require('@robertoachar/whoops');
```

* Initialize whoops

```javascript
const app = express();
app.use(whoops());
```

Expand Down Expand Up @@ -82,35 +84,31 @@ $ npm install

* Running scripts

Action | Usage
--- | ---
Starting development mode | `npm start`
Linting code | `npm run lint`
Running unit tests | `npm run jest`
Running code coverage | `npm run coverage`
Running lint + tests | `npm test`
Sending coverage results to Coveralls.io | `npm run coveralls`
| Action | Usage |
| ---------------------------------------- | ------------------- |
| Linting code | `npm run lint` |
| Running unit tests | `npm run jest` |
| Running code coverage | `npm run coverage` |
| Running lint + tests | `npm test` |
| Sending coverage results to Coveralls.io | `npm run coveralls` |

# Author

[Roberto Achar](https://twitter.com/robertoachar)

# License

[MIT](https://github.com/robertoachar/whoops/blob/master/LICENSE)

[travis-badge]: https://travis-ci.org/robertoachar/whoops.svg?branch=master
[travis-url]: https://travis-ci.org/robertoachar/whoops

[appveyor-badge]: https://ci.appveyor.com/api/projects/status/github/robertoachar/whoops?branch=master&svg=true
[appveyor-url]: https://ci.appveyor.com/project/robertoachar/whoops

[circleci-badge]: https://circleci.com/gh/robertoachar/whoops/tree/master.svg?style=shield
[circleci-url]: https://circleci.com/gh/robertoachar/whoops

[coveralls-badge]: https://coveralls.io/repos/github/robertoachar/whoops/badge.svg?branch=master
[coveralls-url]: https://coveralls.io/github/robertoachar/whoops?branch=master

[npm-badge]: https://img.shields.io/npm/v/@robertoachar/whoops.svg
[npm-url]: https://www.npmjs.com/package/@robertoachar/whoops

[license-badge]: https://img.shields.io/github/license/robertoachar/whoops.svg
[license-url]: https://opensource.org/licenses/MIT
2 changes: 1 addition & 1 deletion appveyor.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
environment:
nodejs_version: "6"
nodejs_version: "8"

install:
- ps: Install-Product node $env:nodejs_version
Expand Down
2 changes: 1 addition & 1 deletion circle.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
machine:
node:
version: 6.11.2
version: 8.9.4

dependencies:
override:
Expand Down
Loading

0 comments on commit db00a92

Please sign in to comment.