Skip to content

Commit

Permalink
Merge 2746988 into 5173306
Browse files Browse the repository at this point in the history
  • Loading branch information
robertoachar committed Jan 15, 2018
2 parents 5173306 + 2746988 commit efa7270
Show file tree
Hide file tree
Showing 19 changed files with 64 additions and 4,589 deletions.
26 changes: 0 additions & 26 deletions .eslintrc

This file was deleted.

10 changes: 10 additions & 0 deletions .eslintrc.json
@@ -0,0 +1,10 @@
{
"extends": ["prettier"],
"plugins": ["prettier"],
"env": {
"es6": true
},
"rules": {
"prettier/prettier": "error"
}
}
1 change: 1 addition & 0 deletions .npmrc
@@ -1,2 +1,3 @@
package-lock = false
progress = false
save-exact = true
4 changes: 4 additions & 0 deletions .prettierrc
@@ -0,0 +1,4 @@
{
"arrowParens": "always",
"singleQuote": true
}
2 changes: 1 addition & 1 deletion .travis.yml
@@ -1,8 +1,8 @@
language: node_js

node_js:
- "6"
- "8"
- "9"

install:
- npm install
Expand Down
10 changes: 10 additions & 0 deletions CHANGELOG.md
@@ -1,5 +1,14 @@
# Changelog

## 1.0.4

* **build**: update packages
* **build**: turn off package-lock file
* **ci**: update node version
* **docs**: update README
* **style**: add prettier
* **style**: format with prettier

## 1.0.3

* **build**: update packages
Expand All @@ -18,4 +27,5 @@
* **docs**: usage instructions

## 1.0.0

* Initial release
21 changes: 8 additions & 13 deletions README.md
Expand Up @@ -91,14 +91,14 @@ $ git clone https://github.com/robertoachar/node-password-storage.git
$ npm install
```

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 |
| ---------------------------------------- | ------------------- |
| 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` |

# Author

Expand All @@ -110,18 +110,13 @@ Sending coverage results to Coveralls.io | `npm run coveralls`

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

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

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

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

[npm-badge]: https://img.shields.io/npm/v/node-password-storage.svg
[npm-url]: https://www.npmjs.com/package/node-password-storage

[license-badge]: https://img.shields.io/github/license/robertoachar/node-password-storage.svg
[license-url]: https://opensource.org/licenses/MIT
2 changes: 1 addition & 1 deletion appveyor.yml
@@ -1,7 +1,7 @@
environment:
matrix:
- nodejs_version: "6"
- nodejs_version: "8"
- nodejs_version: "9"

install:
- ps: Install-Product node $env:nodejs_version
Expand Down
2 changes: 1 addition & 1 deletion circle.yml
@@ -1,6 +1,6 @@
machine:
node:
version: 6.11.5
version: 8.9.4

dependencies:
override:
Expand Down

0 comments on commit efa7270

Please sign in to comment.