Skip to content

Commit 43f3bce

Browse files
committed
Added changelog for 3.2.3 (adjusted postcss config to work with new react-webpack-template).
1 parent f6327e1 commit 43f3bce

File tree

3 files changed

+14
-7
lines changed

3 files changed

+14
-7
lines changed

CHANGELOG.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
# generator-react-webpack - Changelog
22

3+
## 3.2.3
4+
5+
1. Adjusted postcss to work with react-webpack-template 1.4 upwards
6+
2. Improved styling output (provided by [thewtex](https://github.com/thewtex))
7+
38
## 3.2.2
49

510
1. Cleaned up formatting of unit tests

generators/app/index.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ module.exports = generator.Base.extend({
138138
install: function() {
139139
if(this.postcss) {
140140
let postcss = require('./postcss');
141-
postcss.write(path.join(this.destinationRoot(), 'cfg/base.js'));
141+
postcss.write(path.join(this.destinationRoot(), 'cfg/defaults.js'));
142142
}
143143

144144
if(!this.options['skip-install']) {

test/generators/app/indexTest.js

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,7 @@ describe('react-webpack:app', () => {
6565

6666
assert.file([
6767
'cfg/base.js',
68+
'cfg/defaults.js',
6869
'cfg/dev.js',
6970
'cfg/dist.js',
7071
'cfg/test.js',
@@ -159,6 +160,7 @@ describe('react-webpack:app non-default-prompts', () => {
159160

160161
assert.file([
161162
'cfg/base.js',
163+
'cfg/defaults.js',
162164
'cfg/dev.js',
163165
'cfg/dist.js',
164166
'cfg/test.js',
@@ -169,16 +171,16 @@ describe('react-webpack:app non-default-prompts', () => {
169171

170172
it('should insert the postcss loader into the style pipes', () => {
171173

172-
assert.fileContent('cfg/base.js', 'loader: \'style-loader!css-loader!postcss-loader\'');
173-
assert.fileContent('cfg/base.js', 'loader: \'style-loader!css-loader!postcss-loader!sass-loader?outputStyle=expanded&indentedSyntax\'');
174-
assert.fileContent('cfg/base.js', 'loader: \'style-loader!css-loader!postcss-loader!sass-loader?outputStyle=expanded\'');
175-
assert.fileContent('cfg/base.js', 'loader: \'style-loader!css-loader!postcss-loader!less-loader\'');
176-
assert.fileContent('cfg/base.js', 'loader: \'style-loader!css-loader!postcss-loader!stylus-loader\'');
174+
assert.fileContent('cfg/defaults.js', 'loader: \'style-loader!css-loader!postcss-loader\'');
175+
assert.fileContent('cfg/defaults.js', 'loader: \'style-loader!css-loader!postcss-loader!sass-loader?outputStyle=expanded&indentedSyntax\'');
176+
assert.fileContent('cfg/defaults.js', 'loader: \'style-loader!css-loader!postcss-loader!sass-loader?outputStyle=expanded\'');
177+
assert.fileContent('cfg/defaults.js', 'loader: \'style-loader!css-loader!postcss-loader!less-loader\'');
178+
assert.fileContent('cfg/defaults.js', 'loader: \'style-loader!css-loader!postcss-loader!stylus-loader\'');
177179
});
178180

179181
it('should append the postcss function to the base config', () => {
180182

181-
assert.fileContent('cfg/base.js', ',\n postcss: function () {\n return [];\n }');
183+
assert.fileContent('cfg/defaults.js', ',\n postcss: function () {\n return [];\n }');
182184
});
183185

184186
it('should generate required source files', () => {

0 commit comments

Comments
 (0)