3.2.3

Grammar improvement to the style prompt.

CHANGELOG.md

@@ -1,5 +1,22 @@
 # generator-react-webpack - Changelog
 
+## 3.2.3
+
+1. Adjusted postcss to work with react-webpack-template 1.4 upwards
+2. Improved styling output (provided by [thewtex](https://github.com/thewtex))
+
+## 3.2.2
+
+1. Cleaned up formatting of unit tests
+
+## 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

README.md

@@ -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))
 
 ---
 

generators/app/index.js

@@ -138,7 +138,7 @@ module.exports = generator.Base.extend({
   install: function() {
     if(this.postcss) {
       let postcss = require('./postcss');
-      postcss.write(path.join(this.destinationRoot(), 'cfg/base.js'));
+      postcss.write(path.join(this.destinationRoot(), 'cfg/defaults.js'));
     }
 
     if(!this.options['skip-install']) {

generators/app/prompts.js

@@ -11,7 +11,7 @@ module.exports = [
   {
     type: 'list',
     name: 'style',
-    message: 'Which styles language you want to use?',
+    message: 'Which style language do you want to use?',
     choices: utils.config.getChoices('style'),
     default: utils.config.getDefaultChoice('style')
   },

generators/component/index.js

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

generators/component/templates/tests/Base.js

@@ -10,13 +10,13 @@ import createComponent from 'helpers/shallowRenderHelper';
 import <%= component.className %> from '<%= component.webpackPath %>';
 
 describe('<%= component.className %>', () => {
-    let component;
+  let component;
 
-    beforeEach(() => {
-      component = createComponent(<%= component.className %>);
-    });
+  beforeEach(() => {
+    component = createComponent(<%= component.className %>);
+  });
 
-    it('should have its component name as default className', () => {
-      expect(component.props.className).to.equal('<%= style.className %>');
-    });
+  it('should have its component name as default className', () => {
+    expect(component.props.className).to.equal('<%= style.className %>');
+  });
 });

package.json

@@ -1,6 +1,6 @@
 {
   "name": "generator-react-webpack",
-  "version": "3.1.1",
+  "version": "3.2.3",
   "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",

test/generators/app/indexTest.js

@@ -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', () => {
 
@@ -65,6 +65,7 @@ describe('react-webpack:app', () => {
 
       assert.file([
         'cfg/base.js',
+        'cfg/defaults.js',
         'cfg/dev.js',
         'cfg/dist.js',
         'cfg/test.js',
@@ -77,8 +78,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',
@@ -159,6 +160,7 @@ describe('react-webpack:app non-default-prompts', () => {
 
       assert.file([
         'cfg/base.js',
+        'cfg/defaults.js',
         'cfg/dev.js',
         'cfg/dist.js',
         'cfg/test.js',
@@ -169,24 +171,24 @@ describe('react-webpack:app non-default-prompts', () => {
 
     it('should insert the postcss loader into the style pipes', () => {
 
-      assert.fileContent('cfg/base.js', 'loader: \'style-loader!css-loader!postcss-loader\'');
-      assert.fileContent('cfg/base.js', 'loader: \'style-loader!css-loader!postcss-loader!sass-loader?outputStyle=expanded&indentedSyntax\'');
-      assert.fileContent('cfg/base.js', 'loader: \'style-loader!css-loader!postcss-loader!sass-loader?outputStyle=expanded\'');
-      assert.fileContent('cfg/base.js', 'loader: \'style-loader!css-loader!postcss-loader!less-loader\'');
-      assert.fileContent('cfg/base.js', 'loader: \'style-loader!css-loader!postcss-loader!stylus-loader\'');
+      assert.fileContent('cfg/defaults.js', 'loader: \'style-loader!css-loader!postcss-loader\'');
+      assert.fileContent('cfg/defaults.js', 'loader: \'style-loader!css-loader!postcss-loader!sass-loader?outputStyle=expanded&indentedSyntax\'');
+      assert.fileContent('cfg/defaults.js', 'loader: \'style-loader!css-loader!postcss-loader!sass-loader?outputStyle=expanded\'');
+      assert.fileContent('cfg/defaults.js', 'loader: \'style-loader!css-loader!postcss-loader!less-loader\'');
+      assert.fileContent('cfg/defaults.js', 'loader: \'style-loader!css-loader!postcss-loader!stylus-loader\'');
     });
 
     it('should append the postcss function to the base config', () => {
 
-      assert.fileContent('cfg/base.js', ',\n  postcss: function () {\n    return [];\n  }');
+      assert.fileContent('cfg/defaults.js', ',\n  postcss: function () {\n    return [];\n  }');
     });
 
     it('should generate required source files', () => {
 
       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',

test/generators/component/indexTest.js

@@ -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', () => {
 

utils/configopts.json

@@ -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" }
         ]
       },
       {