Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: themang/khaos-es6
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: redux-effects/khaos
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
Can’t automatically merge. Don’t worry, you can still create the pull request.
  • 6 commits
  • 6 files changed
  • 1 contributor

Commits on Jan 4, 2016

  1. FIRST redux effects khaos

    joshrtay committed Jan 4, 2016
    Copy the full SHA
    6e5f8ae View commit details
  2. change title

    joshrtay committed Jan 4, 2016
    Copy the full SHA
    dbd0dcf View commit details

Commits on Jan 7, 2016

  1. remove npmname

    joshrtay committed Jan 7, 2016
    Copy the full SHA
    f3e7b64 View commit details

Commits on Jan 8, 2016

  1. remove tape runner dep

    joshrtay committed Jan 8, 2016
    Copy the full SHA
    9dcb9f8 View commit details
  2. Copy the full SHA
    0766220 View commit details

Commits on Jan 19, 2016

  1. Fix badges

    joshrtay committed Jan 19, 2016
    Copy the full SHA
    a3bcd42 View commit details
Showing with 53 additions and 25 deletions.
  1. +5 −13 Readme.md
  2. +7 −0 template/.travis.yml
  3. +2 −2 template/Makefile
  4. +29 −2 template/Readme.md
  5. +9 −7 template/package.json
  6. +1 −1 template/src/index.js
18 changes: 5 additions & 13 deletions Readme.md
Original file line number Diff line number Diff line change
@@ -1,23 +1,15 @@
# khaos-es6
# khaos

A Khaos template to start new es6 projects quickly.
A Khaos template to start new redux effects library quickly.

## Installation

`$ khaos install @themang/khaos-es6 es6`
`$ khaos install redux-effects/khaos redux-effects`

## Usage

`$ khaos es6 <project>`
`$ khaos redux-effects <project>`

## License

The MIT License

Copyright &copy; 2015, Weo.io &lt;info@weo.io&gt;

Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
MIT
7 changes: 7 additions & 0 deletions template/.travis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
language: node_js
node_js:
- "0.12"
- "4"
- "5"
sudo: false
script: "make test"
4 changes: 2 additions & 2 deletions template/Makefile
Original file line number Diff line number Diff line change
@@ -14,7 +14,7 @@ node_modules: package.json
@touch node_modules

test: node_modules
babel test/*.js
@${BIN}/tape -r babel-register test/*

validate: node_modules
@standard
@@ -31,4 +31,4 @@ all: validate test
# Phony
#

.PHONY: test validate clean build
.PHONY: test validate clean build all
31 changes: 29 additions & 2 deletions template/Readme.md
Original file line number Diff line number Diff line change
@@ -1,14 +1,41 @@

# {{basename}}

[![js-standard-style](https://img.shields.io/badge/code%20style-standard-brightgreen.svg?style=flat)](https://github.com/feross/standard)
[![Build status][travis-image]][travis-url]
[![Git tag][git-image]][git-url]
[![NPM version][npm-image]][npm-url]
[![Code style][standard-image]][standard-url]

{{description}}

## Installation

$ npm install @{{repository}}
$ npm install {{basename}}

## Usage

```js
var {{camelcase basename}} = require('{{basename}}')

```

## API

### {{camelcase basename}}(arg)

- `arg` -

**Returns:**

## License

MIT

[travis-image]: https://img.shields.io/travis/redux-effects/{{basename}}.svg?style=flat-square
[travis-url]: https://travis-ci.org/redux-effects/{{basename}}
[git-image]: https://img.shields.io/github/tag/redux-effects/{{basename}}.svg
[git-url]: https://github.com/redux-effects/{{basename}}
[standard-image]: https://img.shields.io/badge/code%20style-standard-brightgreen.svg?style=flat
[standard-url]: https://github.com/feross/standard
[npm-image]: https://img.shields.io/npm/v/{{basename}}.svg?style=flat-square
[npm-url]: https://npmjs.org/package/{{basename}}
16 changes: 9 additions & 7 deletions template/package.json
Original file line number Diff line number Diff line change
@@ -1,18 +1,20 @@
{
"name": "@{{repository}}",
"name": "{{basename}}",
"description": "{{description}}",
"repository": "git://github.com/{{repository}}.git",
"version": "0.1.0",{{#mit}}
"license": "MIT",{{/mit}}
"repository": "git://github.com/redux-effects/{{basename}}.git",
"version": "0.1.0",
"license": "MIT",
"main": "lib/index.js",
"scripts": {
"prepublish": "make build",
"postpublish": "make clean"
"postpublish": "make clean",
"postversion": "git push && git push --tags && npm publish --access=public"
},
"dependencies": {},
"devDependencies": {
"babel-preset-es2015": "^6.1.2",
"tape": "^4.2.0"
"babel-cli": "^6.4.0",
"babel-preset-es2015": "^6.3.13",
"babel-register": "^6.3.13",
"tape": "^4.2.2"
}
}
2 changes: 1 addition & 1 deletion template/src/index.js
Original file line number Diff line number Diff line change
@@ -10,4 +10,4 @@
* Exports
*/

export default {{basename}}
export default {{camelcase basename}}