commit 491ed16f2e643c9a97043c5dcc71a1b65eab4179
parent 9f565769b4eb3231380b1fccd798089b461d0849
Author: Konstantin Tarkus <hello@tarkus.me>
Date: Wed, 20 Jan 2016 16:25:58 +0300
Update the remaining NPM modules and dependencies
Diffstat:
15 files changed, 36 insertions(+), 68 deletions(-)
diff --git a/docs/data-fetching.md b/docs/data-fetching.md
@@ -10,7 +10,7 @@ export const path = '/products';
export const action = async () => {
const response = await fetch('/api/products');
const data = await response.json();
- return <Layout><Products {...data}</Layout>;
+ return <Layout><Products {...data} /></Layout>;
};
```
diff --git a/package.json b/package.json
@@ -8,63 +8,63 @@
"babel-polyfill": "^6.3.14",
"babel-runtime": "^6.3.19",
"bluebird": "3.1.1",
- "classnames": "2.2.1",
+ "classnames": "2.2.3",
"eventemitter3": "1.1.1",
"express": "4.13.3",
"fastclick": "1.0.6",
- "fbjs": "0.5.1",
- "front-matter": "2.0.1",
- "history": "1.16.0",
+ "fbjs": "0.6.1",
+ "front-matter": "2.0.5",
+ "history": "2.0.0-rc2",
+ "isomorphic-style-loader": "0.0.6",
"jade": "1.11.0",
"node-fetch": "1.3.3",
"normalize.css": "3.0.3",
- "react": "0.14.3",
- "react-dom": "0.14.3",
- "react-routing": "0.0.6",
+ "react": "0.14.6",
+ "react-dom": "0.14.6",
+ "react-routing": "0.0.7",
"source-map-support": "0.4.0",
- "whatwg-fetch": "0.10.1"
+ "whatwg-fetch": "0.11.0"
},
"devDependencies": {
"assets-webpack-plugin": "^3.2.0",
- "autoprefixer": "^6.1.2",
+ "autoprefixer": "^6.3.1",
"babel-cli": "^6.4.5",
- "babel-eslint": "^4.1.6",
+ "babel-eslint": "^5.0.0-beta6",
"babel-loader": "^6.2.1",
"babel-plugin-react-transform": "^2.0.0",
"babel-plugin-transform-runtime": "^6.4.3",
"babel-preset-es2015": "^6.3.13",
"babel-preset-react": "^6.3.13",
"babel-preset-stage-0": "^6.3.13",
- "browser-sync": "^2.10.1",
- "css-loader": "^0.23.0",
+ "browser-sync": "^2.11.1",
+ "css-loader": "^0.23.1",
"csscomb": "^3.1.8",
"del": "^2.2.0",
"eslint": "^1.10.3",
- "eslint-config-airbnb": "^2.1.1",
- "eslint-loader": "^1.1.1",
- "eslint-plugin-react": "^3.11.3",
+ "eslint-config-airbnb": "^3.1.0",
+ "eslint-loader": "^1.2.0",
+ "eslint-plugin-react": "^3.15.0",
"file-loader": "^0.8.5",
"gaze": "^0.5.2",
"git-repository": "^0.1.1",
- "glob": "^6.0.1",
- "isomorphic-style-loader": "0.0.5",
+ "glob": "^6.0.4",
"jest-cli": "^0.8.2",
- "jscs": "^2.7.0",
+ "jscs": "^2.8.0",
"json-loader": "^0.5.4",
- "lodash.merge": "^3.3.2",
+ "lodash.merge": "^4.0.1",
"mkdirp": "^0.5.1",
"ncp": "^2.0.0",
- "postcss": "^5.0.13",
+ "postcss": "^5.0.14",
"postcss-import": "^7.1.3",
"postcss-loader": "^0.8.0",
- "precss": "^1.3.0",
+ "precss": "^1.4.0",
"raw-loader": "^0.5.1",
- "react-transform-catch-errors": "^1.0.0",
+ "react-transform-catch-errors": "^1.0.1",
"react-transform-hmr": "^1.0.1",
"redbox-react": "^1.2.0",
"replace": "^0.3.0",
"url-loader": "^0.5.7",
- "webpack": "^1.12.9",
+ "webpack": "^1.12.11",
"webpack-hot-middleware": "^2.6.0",
"webpack-middleware": "^1.4.0"
},
diff --git a/src/components/ContactPage/ContactPage.js b/src/components/ContactPage/ContactPage.js
@@ -8,8 +8,8 @@
*/
import React, { Component, PropTypes } from 'react';
+import withStyles from 'isomorphic-style-loader/lib/withStyles';
import s from './ContactPage.scss';
-import withStyles from '../withStyles';
const title = 'Contact Us';
diff --git a/src/components/ContentPage/ContentPage.js b/src/components/ContentPage/ContentPage.js
@@ -8,8 +8,8 @@
*/
import React, { Component, PropTypes } from 'react';
+import withStyles from 'isomorphic-style-loader/lib/withStyles';
import s from './ContentPage.scss';
-import withStyles from '../withStyles';
class ContentPage extends Component {
diff --git a/src/components/ErrorPage/ErrorPage.js b/src/components/ErrorPage/ErrorPage.js
@@ -8,8 +8,8 @@
*/
import React, { Component, PropTypes } from 'react';
+import withStyles from 'isomorphic-style-loader/lib/withStyles';
import s from './ErrorPage.scss';
-import withStyles from '../withStyles';
const title = 'Error';
diff --git a/src/components/Feedback/Feedback.js b/src/components/Feedback/Feedback.js
@@ -8,8 +8,8 @@
*/
import React, { Component } from 'react';
+import withStyles from 'isomorphic-style-loader/lib/withStyles';
import s from './Feedback.scss';
-import withStyles from '../withStyles';
class Feedback extends Component {
diff --git a/src/components/Footer/Footer.js b/src/components/Footer/Footer.js
@@ -8,8 +8,8 @@
*/
import React, { Component } from 'react';
+import withStyles from 'isomorphic-style-loader/lib/withStyles';
import s from './Footer.scss';
-import withStyles from '../withStyles';
import Link from '../Link';
class Footer extends Component {
diff --git a/src/components/Header/Header.js b/src/components/Header/Header.js
@@ -8,8 +8,8 @@
*/
import React, { Component } from 'react';
+import withStyles from 'isomorphic-style-loader/lib/withStyles';
import s from './Header.scss';
-import withStyles from '../withStyles';
import Link from '../Link';
import Navigation from '../Navigation';
diff --git a/src/components/Link/Link.js b/src/components/Link/Link.js
@@ -65,7 +65,7 @@ class Link extends Component {
render() {
const { to, query, ...props } = this.props;
- return <a href={Location.createHref(to, query)} {...props} onClick={Link.handleClick} />;
+ return <a href={Location.createHref(to, query)} {...props} onClick={this.handleClick} />;
}
}
diff --git a/src/components/LoginPage/LoginPage.js b/src/components/LoginPage/LoginPage.js
@@ -8,8 +8,8 @@
*/
import React, { Component, PropTypes } from 'react';
+import withStyles from 'isomorphic-style-loader/lib/withStyles';
import s from './LoginPage.scss';
-import withStyles from '../withStyles';
const title = 'Log In';
diff --git a/src/components/Navigation/Navigation.js b/src/components/Navigation/Navigation.js
@@ -9,8 +9,8 @@
import React, { Component, PropTypes } from 'react';
import cx from 'classnames';
+import withStyles from 'isomorphic-style-loader/lib/withStyles';
import s from './Navigation.scss';
-import withStyles from '../withStyles';
import Link from '../Link';
class Navigation extends Component {
diff --git a/src/components/NotFoundPage/NotFoundPage.js b/src/components/NotFoundPage/NotFoundPage.js
@@ -8,8 +8,8 @@
*/
import React, { Component, PropTypes } from 'react';
+import withStyles from 'isomorphic-style-loader/lib/withStyles';
import s from './NotFoundPage.scss';
-import withStyles from '../withStyles';
const title = 'Page Not Found';
diff --git a/src/components/RegisterPage/RegisterPage.js b/src/components/RegisterPage/RegisterPage.js
@@ -8,8 +8,8 @@
*/
import React, { Component, PropTypes } from 'react';
+import withStyles from 'isomorphic-style-loader/lib/withStyles';
import s from './RegisterPage.scss';
-import withStyles from '../withStyles';
const title = 'New User Registration';
diff --git a/src/components/TextBox/TextBox.js b/src/components/TextBox/TextBox.js
@@ -8,8 +8,8 @@
*/
import React, { Component, PropTypes } from 'react';
+import withStyles from 'isomorphic-style-loader/lib/withStyles';
import s from './TextBox.scss';
-import withStyles from '../../decorators/withStyles';
@withStyles(s)
class TextBox extends Component {
diff --git a/src/components/withStyles.js b/src/components/withStyles.js
@@ -1,32 +0,0 @@
-/**
- * React Starter Kit (https://www.reactstarterkit.com/)
- *
- * Copyright © 2014-2016 Kriasoft, LLC. All rights reserved.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE.txt file in the root directory of this source tree.
- */
-
-import React, { Component, PropTypes } from 'react';
-
-function withStyles(BaseComponent, ...styles) {
- return class StyledComponent extends Component {
- static contextTypes = {
- insertCss: PropTypes.func.isRequired,
- };
-
- componentWillMount() {
- this.removeCss = this.context.insertCss.apply(undefined, styles);
- }
-
- componentWillUnmount() {
- setTimeout(this.removeCss, 0);
- }
-
- render() {
- return <BaseComponent {...this.props} />;
- }
- };
-}
-
-export default withStyles;