commit fe41f1f645ee7ea1ec37ad73bad0ccd8fbc3177c
parent d6b644d071537c1bc0e7b7735edea9e43ec3163f
Author: Konstantin Tarkus <hello@tarkus.me>
Date: Fri, 10 Apr 2015 21:24:03 +0300
Update webpack, css-loader and style-loader
- webpack 1.7.3 > 1.8.4: http://webpack.github.io/docs/changelog.html
- css-loader: 0.9.1 > 0.10.1
- style-loader: 0.9.1 > 0.10.1
There is also a cosmetic update to React style guide
Diffstat:
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/docs/react-style-guide.md b/docs/react-style-guide.md
@@ -6,7 +6,7 @@
- Avoid having shared resources between components (css, images etc.)
- Keep all components' folders in the same parent folder (avoid nesting)
-A sample file structure per component:
+##### File structure per component example:
```
/src/components/Navigation/icon.svg
@@ -31,7 +31,7 @@ Use [BEM](https://bem.info/) approach for naming CSS classes. See also [SUIT CSS
.ComponentName-elementName--modifier { }
```
-For example:
+##### CSS styling example:
```jsx
// JSX
@@ -69,7 +69,7 @@ For example:
border: 0;
color: @default-color;
text-decoration: none;
- line-height: @line-height;
+ line-height: 25px;
transition: background-color .3s ease;
&,
@@ -91,7 +91,7 @@ For example:
- Use [ES6 classes](https://facebook.github.io/react/blog/2015/01/27/react-v0.13.0-beta-1.html#es6-classes) for creating new React components
- Use higher-order components to extend the functionality of existing components
-A sample component class:
+##### React component example:
```js
'use strict';
@@ -136,7 +136,7 @@ export default SampleComponent;
Put custom methods and properties at the bottom of the file, after the render() method.
-A sample higher-order component:
+##### Higher-order React component example:
```js
'use strict';
diff --git a/package.json b/package.json
@@ -28,7 +28,7 @@
"babel-eslint": "^2.0.2",
"babel-loader": "^4.3.0",
"browser-sync": "^2.5.3",
- "css-loader": "^0.9.1",
+ "css-loader": "^0.10.1",
"del": "^1.1.1",
"eslint": "^0.18.0",
"eslint-loader": "^0.9.0",
@@ -60,9 +60,9 @@
"psi": "^1.0.6",
"react-tools": "^0.13.1",
"run-sequence": "^1.0.2",
- "style-loader": "^0.9.0",
+ "style-loader": "^0.10.1",
"url-loader": "^0.5.5",
- "webpack": "^1.7.3",
+ "webpack": "^1.8.4",
"webpack-dev-server": "^1.8.0"
},
"jest": {
