Compare commits

...
7 Commits
Author SHA1 Message Date
Chris 165b4ae956 3.2.1 2015-12-28 08:21:27 +01:00
Chris cb08986a6d Updated tests for new version of react-webpack-template 2015-12-28 08:21:00 +01:00
Chris 52e7528cd2 Merge pull request #179 from stylesuxx/master
Added link to generator-react-webpack-redux to the extending section
2015-12-22 19:52:34 +01:00
stylesuxx 85c0f7f343 Added link to generator-react-webpack-redux to the extending section 2015-12-22 16:47:01 +01:00
Chris 8ee10ffd52 3.2.0 2015-12-18 08:44:52 +01:00
Chris 60bf2aae3a Adjusted generator for updated yeoman-generator to 0.22.x 2015-12-18 08:44:42 +01:00
Chris cb98c7e528 Updated sass dependencies to new versions (fixes https://github.com/newtriks/generator-react-webpack/issues/171) 2015-12-01 07:48:31 +01:00
7 changed files with 27 additions and 16 deletions
+8
View File
@@ -1,5 +1,13 @@
# generator-react-webpack - Changelog
## 3.2.1
1. Updated tests for new version of react-webpack-template
## 3.2.0
1. Updated yeoman-generator package to new version 0.22.1 (some methods like generator.NamedBase are now deprecated!)
## 3.1.1
1. Added bugfix for https://github.com/newtriks/generator-react-webpack/issues/170
+1
View File
@@ -26,6 +26,7 @@ If you have built a generator using generator-react-webpack, tell us and we will
## Generators that extend generator-react-webpack
- [Generator-React-Webpack-Alt](https://github.com/weblogixx/generator-react-webpack-alt) (Adds ability to create actions, stores and sources for [alt.js](http://alt.js.org))
- [Generator-React-Webpack-Redux](https://github.com/stylesuxx/generator-react-webpack-redux) (Adds ability to create actions and reducers for [Redux](https://github.com/rackt/redux))
---
+3 -3
View File
@@ -2,11 +2,11 @@
let generator = require('yeoman-generator');
let utils = require('../../utils/all');
module.exports = generator.NamedBase.extend({
module.exports = generator.Base.extend({
constructor: function() {
generator.NamedBase.apply(this, arguments);
generator.Base.apply(this, arguments);
this.argument('name', { type: String, required: true });
this.option('stateless', {
desc: 'Create a stateless component instead of a full one',
defaults: false
+5 -3
View File
@@ -1,6 +1,6 @@
{
"name": "generator-react-webpack",
"version": "3.1.1",
"version": "3.2.1",
"description": "Yeoman generator for using React with Webpack via Babel",
"keywords": [
"yeoman-generator",
@@ -42,7 +42,7 @@
"dependencies": {
"react-webpack-template": "^1.0.0",
"underscore.string": "^3.2.2",
"yeoman-generator": "^0.21.0",
"yeoman-generator": "^0.22.0",
"yeoman-welcome": "^1.0.1",
"esprima": "^2.7.0",
"esprima-walk": "^0.1.0",
@@ -50,7 +50,9 @@
},
"devDependencies": {
"chai": "^3.2.0",
"mocha": "^2.3.2"
"mocha": "^2.3.2",
"yeoman-assert": "^2.1.1",
"yeoman-test": "^1.0.0"
},
"engines": {
"node": ">=4.0.0",
+4 -4
View File
@@ -1,8 +1,8 @@
'use strict';
let path = require('path');
let expect = require('chai').expect;
let assert = require('yeoman-generator').assert;
let helpers = require('yeoman-generator').test
let assert = require('yeoman-assert');
let helpers = require('yeoman-test');
describe('react-webpack:app', () => {
@@ -77,8 +77,8 @@ describe('react-webpack:app', () => {
assert.file([
'src/actions/README.md',
'src/index.js',
'src/components/Main.js',
'src/components/run.js',
'src/favicon.ico',
'src/images/yeoman.png',
'src/index.html',
@@ -185,8 +185,8 @@ describe('react-webpack:app non-default-prompts', () => {
assert.file([
'src/actions/README.md',
'src/index.js',
'src/components/Main.js',
'src/components/run.js',
'src/favicon.ico',
'src/images/yeoman.png',
'src/index.html',
+2 -2
View File
@@ -1,7 +1,7 @@
'use strict';
let path = require('path');
let assert = require('yeoman-generator').assert;
let helpers = require('yeoman-generator').test
let assert = require('yeoman-assert');
let helpers = require('yeoman-test');
describe('react-webpack:component', () => {
+4 -4
View File
@@ -63,8 +63,8 @@
"value": "sass",
"suffix": ".sass",
"packages": [
{ "name": "sass-loader", "version": "^1.0.1" },
{ "name": "node-sass", "version": "^3.3.3" }
{ "name": "sass-loader", "version": "^3.1.2" },
{ "name": "node-sass", "version": "^3.4.2" }
]
},
{
@@ -72,8 +72,8 @@
"value": "scss",
"suffix": ".scss",
"packages": [
{ "name": "sass-loader", "version": "^1.0.1" },
{ "name": "node-sass", "version": "^3.3.3" }
{ "name": "sass-loader", "version": "^3.1.2" },
{ "name": "node-sass", "version": "^3.4.2" }
]
},
{