Compare commits

..
5 Commits
6 changed files with 13 additions and 7 deletions
+2 -1
View File
@@ -1,6 +1,7 @@
language: node_js
sudo: false
node_js:
- '4.1.0'
- '4.2.2'
before_install:
- currentfolder=${PWD##*/}
- if [ "$currentfolder" != 'generator-react-webpack' ]; then cd .. && eval "mv $currentfolder generator-react-webpack" && cd generator-react-webpack; fi
+4
View File
@@ -1,5 +1,9 @@
# generator-react-webpack - Changelog
## 3.1.1
1. Added bugfix for https://github.com/newtriks/generator-react-webpack/issues/170
## 3.1.0
1. Added support for postcss (Patch provided by [stylesuxx](https://github.com/stylesuxx))
+2 -2
View File
@@ -83,7 +83,7 @@ module.exports = generator.Base.extend({
if(styleConfig && styleConfig.packages) {
for(let dependency of styleConfig.packages) {
packageSettings.dependencies[dependency.name] = dependency.version;
packageSettings.devDependencies[dependency.name] = dependency.version;
}
}
@@ -92,7 +92,7 @@ module.exports = generator.Base.extend({
if(this.postcss && postcssConfig && postcssConfig.packages) {
for(let dependency of postcssConfig.packages) {
packageSettings.dependencies[dependency.name] = dependency.version;
packageSettings.devDependencies[dependency.name] = dependency.version;
}
}
+1 -1
View File
@@ -1,6 +1,6 @@
{
"name": "generator-react-webpack",
"version": "3.1.0",
"version": "3.1.1",
"description": "Yeoman generator for using React with Webpack via Babel",
"keywords": [
"yeoman-generator",
+1 -2
View File
@@ -169,8 +169,7 @@ describe('react-webpack:app non-default-prompts', () => {
it('should insert the postcss loader into the style pipes', () => {
assert.fileContent('cfg/base.js', 'loader: \'style!css!postcss-loader\'');
//assert.fileContent('cfg/base.js', 'loader: \'style-loader!css-loader!postcss-loader\'');
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\'');
+3 -1
View File
@@ -90,7 +90,9 @@
"value": "stylus",
"suffix": ".styl",
"packages": [
{ "name": "stylus-loader", "version": "^0.5.0" }
{ "name": "stylus-loader", "version": "^0.5.0" },
{ "name": "stylus", "version": "~0.49.2" },
{ "name": "nib", "version": "~1.0.4" }
]
}
],