Skip to content

Commit

Permalink
Merge branch 'release/1.0.3'
Browse files Browse the repository at this point in the history
  • Loading branch information
stylesuxx committed Sep 12, 2016
2 parents 2da3b64 + f381d50 commit 8d06409
Show file tree
Hide file tree
Showing 6 changed files with 24 additions and 3 deletions.
14 changes: 14 additions & 0 deletions .travis.yml
Expand Up @@ -6,6 +6,20 @@ node_js:
- '6.2'
- '6.1'
- '6.0'
- '5.12'
- '5.11'
- '5.10'
- '5.9'
- '5.8'
- '5.7'
- '5.6'
- '5.5'
- '5.4'
- '5.3'
- '5.2'
- '5.1'
- '5.0'
- '4.5'
before_install:
- currentfolder=${PWD##*/}
- if [ "$currentfolder" != 'generator-react-webpack-redux' ]; then cd .. && eval "mv $currentfolder generator-react-webpack-redux" && cd generator-react-webpack-redux; fi
4 changes: 4 additions & 0 deletions README.md
Expand Up @@ -17,6 +17,9 @@ There are currently some features missing from the generator. These will be avai
- [ ] Add optional routing via [react-router-redux](https://github.com/rackt/react-router-redux)
- [ ] Route generator

## Requirements
Make sure your nodeJS version is **>=4.5** and npm version is **>=3.0.0**.

## Installation
```bash
npm install -g yo
Expand Down Expand Up @@ -80,3 +83,4 @@ If you want to submit a pull request please do so from and against the *develop*

## License
[MIT license](http://opensource.org/licenses/MIT)

1 change: 1 addition & 0 deletions generators/reducer/index.js
@@ -1,3 +1,4 @@
'use strict';
const generator = require('yeoman-generator');
const path = require('path');
const walk = require('esprima-walk');
Expand Down
6 changes: 3 additions & 3 deletions package.json
@@ -1,6 +1,6 @@
{
"name": "generator-react-webpack-redux",
"version": "1.0.2",
"version": "1.0.3",
"description": "Yeoman generator for ReactJS and Flux (Redux) via Webpack",
"keywords": [
"yeoman-generator",
Expand Down Expand Up @@ -53,8 +53,8 @@
"yeoman-test": "^1.0.0"
},
"engines": {
"node": ">=4.0.0",
"iojs": ">=1.1.0"
"node": ">=4.5.0",
"npm": ">=3.0.0"
},
"license": "MIT"
}
1 change: 1 addition & 0 deletions test/generators/action/indexTest.js
@@ -1,3 +1,4 @@
'use strict';
const path = require('path');
const assert = require('yeoman-assert'); // eslint-disable-line
const helpers = require('yeoman-test'); // eslint-disable-line
Expand Down
1 change: 1 addition & 0 deletions test/generators/reducer/indexTest.js
@@ -1,3 +1,4 @@
'use strict';
const path = require('path');
const assert = require('yeoman-assert'); // eslint-disable-line
const helpers = require('yeoman-test'); // eslint-disable-line
Expand Down

0 comments on commit 8d06409

Please sign in to comment.