Skip to content

Commit

Permalink
Rename sort-configuration-files to sort
Browse files Browse the repository at this point in the history
  • Loading branch information
mickvangelderen committed Mar 20, 2016
1 parent 04e06d8 commit c55af6d
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 8 deletions.
12 changes: 10 additions & 2 deletions development.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,19 @@ You can always inspect the `package.json` or issue `npm run` to view the availab
* `npm run check-node-version`: Check your node version.
* `npm run clean`: Remove built assets.
* `npm run lint`: Check code syntax and style.
* `npm run post-merge`: Run when you resume working on your package.
* `npm run resume`: Run when you resume working on your package.
* `npm run setup`: Run after cloning.
* `npm run sort-configuration-files`: Sort files to minimize merge conflicts.
* `npm run sort`: Sort files to minimize merge conflicts.
* `npm run test`: Check version, lint and test.

## Hooks

The following git hooks are installed by running `npm run setup`:

* [post-checkout](tools/hooks/post-checkout): Simply runs `npm run post-checkout`.
* [post-merge](tools/hooks/post-merge): Simply runs `npm run post-merge`.
* [pre-commit](tools/hooks/pre-commit): Simply runs `npm run pre-commit`.

## Versioning and publishing

Simply use [`npm version <version>`](https://docs.npmjs.com/cli/version) and [`npm publish`](https://docs.npmjs.com/cli/publish).
Expand Down
12 changes: 6 additions & 6 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,14 +36,14 @@
"check-node-version": "babel-node tools/check-node-version",
"clean": "rm -rf lib",
"lint": "eslint src test",
"post-checkout": "npm run -s update",
"post-merge": "npm run -s update",
"pre-commit": "npm run -s sort-configuration-files -- --error-on-changes && npm test",
"post-checkout": "npm run -s resume",
"post-merge": "npm run -s resume",
"pre-commit": "npm run -s sort -- --error-on-changes && npm test",
"preversion": "npm run -s clean && npm run -s build",
"resume": "npm update && npm run -s check-node-version && npm prune && npm dedupe && npm outdated --long",
"setup": "cp tools/hooks/* .git/hooks/ && git config push.followTags true",
"sort-configuration-files": "babel-node tools/sort-configuration-files",
"test": "npm run -s check-node-version && npm run -s lint && mocha \"{src,test}/**/*.test.js\"",
"update": "npm update && npm run -s check-node-version && npm prune && npm dedupe && npm outdated --long"
"sort": "babel-node tools/sort",
"test": "npm run -s check-node-version && npm run -s lint && mocha \"{src,test}/**/*.test.js\""
},
"version": "0.1.0"
}
File renamed without changes.

0 comments on commit c55af6d

Please sign in to comment.