mirror of
https://github.com/wassname/generator-react-webpack.git
synced 2026-09-09 11:22:44 +08:00
Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
498c1032f2 | ||
|
|
20cbcee3fe | ||
|
|
e74b89d8ea | ||
|
|
4e2650f244 | ||
|
|
c99d3c6682 |
+2
-1
@@ -1,6 +1,7 @@
|
|||||||
language: node_js
|
language: node_js
|
||||||
|
sudo: false
|
||||||
node_js:
|
node_js:
|
||||||
- '4.1.0'
|
- '4.2.2'
|
||||||
before_install:
|
before_install:
|
||||||
- currentfolder=${PWD##*/}
|
- currentfolder=${PWD##*/}
|
||||||
- if [ "$currentfolder" != 'generator-react-webpack' ]; then cd .. && eval "mv $currentfolder generator-react-webpack" && cd generator-react-webpack; fi
|
- if [ "$currentfolder" != 'generator-react-webpack' ]; then cd .. && eval "mv $currentfolder generator-react-webpack" && cd generator-react-webpack; fi
|
||||||
|
|||||||
@@ -1,5 +1,9 @@
|
|||||||
# generator-react-webpack - Changelog
|
# generator-react-webpack - Changelog
|
||||||
|
|
||||||
|
## 3.1.1
|
||||||
|
|
||||||
|
1. Added bugfix for https://github.com/newtriks/generator-react-webpack/issues/170
|
||||||
|
|
||||||
## 3.1.0
|
## 3.1.0
|
||||||
|
|
||||||
1. Added support for postcss (Patch provided by [stylesuxx](https://github.com/stylesuxx))
|
1. Added support for postcss (Patch provided by [stylesuxx](https://github.com/stylesuxx))
|
||||||
|
|||||||
@@ -83,7 +83,7 @@ module.exports = generator.Base.extend({
|
|||||||
if(styleConfig && styleConfig.packages) {
|
if(styleConfig && styleConfig.packages) {
|
||||||
|
|
||||||
for(let dependency of 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) {
|
if(this.postcss && postcssConfig && postcssConfig.packages) {
|
||||||
|
|
||||||
for(let dependency of postcssConfig.packages) {
|
for(let dependency of postcssConfig.packages) {
|
||||||
packageSettings.dependencies[dependency.name] = dependency.version;
|
packageSettings.devDependencies[dependency.name] = dependency.version;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
+1
-1
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "generator-react-webpack",
|
"name": "generator-react-webpack",
|
||||||
"version": "3.1.0",
|
"version": "3.1.1",
|
||||||
"description": "Yeoman generator for using React with Webpack via Babel",
|
"description": "Yeoman generator for using React with Webpack via Babel",
|
||||||
"keywords": [
|
"keywords": [
|
||||||
"yeoman-generator",
|
"yeoman-generator",
|
||||||
|
|||||||
@@ -169,8 +169,7 @@ describe('react-webpack:app non-default-prompts', () => {
|
|||||||
|
|
||||||
it('should insert the postcss loader into the style pipes', () => {
|
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&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!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!less-loader\'');
|
||||||
|
|||||||
@@ -90,7 +90,9 @@
|
|||||||
"value": "stylus",
|
"value": "stylus",
|
||||||
"suffix": ".styl",
|
"suffix": ".styl",
|
||||||
"packages": [
|
"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" }
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
|
|||||||
Reference in New Issue
Block a user