commit fa3d6fa4568628c41203e16ae98942d8951cc7d8
parent 85c441594bda229fea6921af04eae7cf815fd400
Author: Vladimir Kutepov <frenzzy.man@gmail.com>
Date: Fri, 2 Sep 2016 08:53:50 +0400
Update dependencies: Babel 6.14, React 15.3, ESLint 3 (#831)
Diffstat:
7 files changed, 81 insertions(+), 70 deletions(-)
diff --git a/package.json b/package.json
@@ -5,106 +5,106 @@
"npm": ">=3.3 <4"
},
"dependencies": {
- "babel-polyfill": "6.9.1",
- "babel-runtime": "6.9.2",
- "bluebird": "3.4.0",
- "body-parser": "1.15.1",
+ "babel-polyfill": "6.13.0",
+ "babel-runtime": "6.11.6",
+ "bluebird": "3.4.5",
+ "body-parser": "1.15.2",
"classnames": "2.2.5",
"cookie-parser": "1.4.3",
- "core-js": "2.4.0",
+ "core-js": "2.4.1",
"eventemitter3": "1.2.0",
- "express": "4.13.4",
- "express-graphql": "0.5.3",
+ "express": "4.14.0",
+ "express-graphql": "0.5.4",
"express-jwt": "3.4.0",
"fastclick": "1.0.6",
- "fbjs": "0.8.3",
+ "fbjs": "0.8.4",
"front-matter": "2.1.0",
- "graphiql": "0.7.2",
- "graphql": "0.6.0",
+ "graphiql": "0.7.8",
+ "graphql": "0.7.0",
"history": "3.0.0",
"isomorphic-style-loader": "1.0.0",
- "jsonwebtoken": "7.0.0",
- "markdown-it": "6.0.5",
- "node-fetch": "1.5.3",
- "normalize.css": "4.1.1",
+ "jsonwebtoken": "7.1.9",
+ "markdown-it": "7.0.1",
+ "node-fetch": "1.6.0",
+ "normalize.css": "4.2.0",
"passport": "0.3.2",
"passport-facebook": "2.1.1",
"pretty-error": "2.0.0",
- "react": "15.1.0",
- "react-dom": "15.1.0",
- "sequelize": "3.23.3",
- "source-map-support": "0.4.0",
+ "react": "15.3.1",
+ "react-dom": "15.3.1",
+ "sequelize": "3.24.1",
+ "source-map-support": "0.4.2",
"sqlite3": "3.1.4",
"universal-router": "1.2.2",
"whatwg-fetch": "1.0.0"
},
"devDependencies": {
"assets-webpack-plugin": "^3.4.0",
- "autoprefixer": "^6.3.6",
- "babel-cli": "^6.9.0",
- "babel-core": "^6.9.0",
- "babel-eslint": "^6.0.4",
- "babel-loader": "^6.2.4",
+ "autoprefixer": "^6.4.0",
+ "babel-cli": "^6.14.0",
+ "babel-core": "^6.14.0",
+ "babel-eslint": "^6.1.2",
+ "babel-loader": "^6.2.5",
"babel-plugin-react-transform": "^2.0.2",
- "babel-plugin-rewire": "^1.0.0-rc-3",
- "babel-plugin-transform-react-constant-elements": "^6.8.0",
+ "babel-plugin-rewire": "^1.0.0-rc-7",
+ "babel-plugin-transform-react-constant-elements": "^6.9.1",
"babel-plugin-transform-react-inline-elements": "^6.8.0",
- "babel-plugin-transform-react-remove-prop-types": "^0.2.7",
- "babel-plugin-transform-runtime": "^6.9.0",
- "babel-preset-es2015": "^6.9.0",
+ "babel-plugin-transform-react-remove-prop-types": "^0.2.9",
+ "babel-plugin-transform-runtime": "^6.15.0",
+ "babel-preset-es2015": "^6.14.0",
"babel-preset-node5": "^11.1.0",
- "babel-preset-react": "^6.5.0",
+ "babel-preset-react": "^6.11.1",
"babel-preset-stage-0": "^6.5.0",
- "babel-register": "^6.9.0",
- "babel-template": "^6.9.0",
- "babel-types": "^6.9.0",
- "browser-sync": "^2.12.8",
+ "babel-register": "^6.14.0",
+ "babel-template": "^6.15.0",
+ "babel-types": "^6.15.0",
+ "browser-sync": "^2.14.3",
"chai": "^3.5.0",
- "css-loader": "^0.23.1",
- "del": "^2.2.0",
- "enzyme": "^2.3.0",
- "eslint": "^2.10.2",
- "eslint-config-airbnb": "^9.0.1",
- "eslint-loader": "^1.3.0",
- "eslint-plugin-import": "^1.8.1",
- "eslint-plugin-jsx-a11y": "^1.2.2",
- "eslint-plugin-react": "^5.1.1",
+ "css-loader": "^0.24.0",
+ "del": "^2.2.2",
+ "enzyme": "^2.4.1",
+ "eslint": "^3.4.0",
+ "eslint-config-airbnb": "^10.0.1",
+ "eslint-loader": "^1.5.0",
+ "eslint-plugin-import": "^1.14.0",
+ "eslint-plugin-jsx-a11y": "^2.2.1",
+ "eslint-plugin-react": "^6.2.0",
"extend": "^3.0.0",
- "file-loader": "^0.8.5",
- "gaze": "^1.0.0",
+ "file-loader": "^0.9.0",
+ "gaze": "^1.1.1",
"git-repository": "^0.1.4",
- "glob": "^7.0.3",
+ "glob": "^7.0.6",
"json-loader": "^0.5.4",
"mkdirp": "^0.5.1",
- "mocha": "^2.5.3",
+ "mocha": "^3.0.2",
"ncp": "^2.0.0",
- "pixrem": "^3.0.1",
+ "pixrem": "^3.0.2",
"pleeease-filters": "^3.0.0",
- "postcss": "^5.0.21",
- "postcss-calc": "^5.2.1",
+ "postcss": "^5.1.2",
+ "postcss-calc": "^5.3.1",
"postcss-color-function": "^2.0.1",
"postcss-custom-media": "^5.0.1",
"postcss-custom-properties": "^5.0.1",
"postcss-custom-selectors": "^3.0.0",
"postcss-flexbugs-fixes": "^2.0.0",
"postcss-import": "^8.1.2",
- "postcss-loader": "^0.9.1",
+ "postcss-loader": "^0.11.1",
"postcss-media-minmax": "^2.1.2",
"postcss-nesting": "^2.3.1",
"postcss-pseudoelements": "^3.0.0",
"postcss-selector-matches": "^2.0.1",
"postcss-selector-not": "^2.0.0",
"raw-loader": "^0.5.1",
- "react-addons-test-utils": "^15.1.0",
+ "react-addons-test-utils": "15.3.1",
"react-transform-catch-errors": "^1.0.2",
"react-transform-hmr": "^1.0.4",
- "redbox-react": "^1.2.6",
- "sinon": "^2.0.0-pre",
- "stylelint": "^6.6.0",
- "stylelint-config-standard": "^9.0.0",
+ "redbox-react": "^1.3.0",
+ "sinon": "^2.0.0-pre.2",
+ "stylelint": "^7.2.0",
+ "stylelint-config-standard": "^13.0.0",
"url-loader": "^0.5.7",
- "webpack": "^1.13.1",
- "webpack-hot-middleware": "^2.10.0",
+ "webpack": "^1.13.2",
+ "webpack-hot-middleware": "^2.12.2",
"webpack-middleware": "^1.5.1"
},
"babel": {
@@ -131,18 +131,30 @@
"browser": true
},
"rules": {
- "no-confusing-arrow": 0,
- "react/jsx-quotes": 0,
+ "generator-star-spacing": 0,
+ "import/no-extraneous-dependencies": 0,
"jsx-quotes": [
2,
"prefer-double"
- ]
+ ],
+ "no-confusing-arrow": 0,
+ "react/jsx-filename-extension": 0,
+ "react/jsx-quotes": 0,
+ "react/require-extension": 0
}
},
"stylelint": {
"extends": "stylelint-config-standard",
"rules": {
"string-quotes": "single",
+ "property-no-unknown": [
+ true,
+ {
+ "ignoreProperties": [
+ "composes"
+ ]
+ }
+ ],
"selector-pseudo-class-no-unknown": [
true,
{
diff --git a/src/client.js b/src/client.js
@@ -11,9 +11,9 @@ import 'babel-polyfill';
import ReactDOM from 'react-dom';
import FastClick from 'fastclick';
import UniversalRouter from 'universal-router';
+import { readState, saveState } from 'history/lib/DOMStateStorage';
import routes from './routes';
import history from './core/history';
-import { readState, saveState } from 'history/lib/DOMStateStorage';
import {
addEventListener,
removeEventListener,
diff --git a/src/components/Html.js b/src/components/Html.js
@@ -3,7 +3,7 @@ import { analytics } from '../config';
function Html({ title, description, style, script, children }) {
return (
- <html className="no-js" lang="">
+ <html className="no-js" lang="en">
<head>
<meta charSet="utf-8" />
<meta httpEquiv="x-ua-compatible" content="ie=edge" />
diff --git a/src/routes/error/ErrorPage.css b/src/routes/error/ErrorPage.css
@@ -46,7 +46,6 @@ pre {
}
@media only screen and (max-width: 280px) {
-
body,
p {
width: 95%;
@@ -56,5 +55,4 @@ pre {
font-size: 1.5em;
margin: 0 0 0.3em;
}
-
}
diff --git a/src/routes/error/ErrorPage.js b/src/routes/error/ErrorPage.js
@@ -11,7 +11,7 @@ import React, { PropTypes } from 'react';
import withStyles from 'isomorphic-style-loader/lib/withStyles';
import s from './ErrorPage.css';
-export function ErrorPage({ error }, context) {
+function ErrorPage({ error }, context) {
let title = 'Error';
let content = 'Sorry, a critical error occurred on this page.';
let errorMessage = null;
@@ -39,4 +39,5 @@ export function ErrorPage({ error }, context) {
ErrorPage.propTypes = { error: PropTypes.object.isRequired };
ErrorPage.contextTypes = { setTitle: PropTypes.func.isRequired };
+export { ErrorPage as ErrorPageWithoutStyle };
export default withStyles(s)(ErrorPage);
diff --git a/src/server.js b/src/server.js
@@ -17,11 +17,11 @@ import expressGraphQL from 'express-graphql';
import jwt from 'jsonwebtoken';
import React from 'react';
import ReactDOM from 'react-dom/server';
-import Html from './components/Html';
-import { ErrorPage } from './routes/error/ErrorPage';
-import errorPageStyle from './routes/error/ErrorPage.css';
import UniversalRouter from 'universal-router';
import PrettyError from 'pretty-error';
+import Html from './components/Html';
+import { ErrorPageWithoutStyle } from './routes/error/ErrorPage';
+import errorPageStyle from './routes/error/ErrorPage.css';
import passport from './core/passport';
import models from './data/models';
import schema from './data/schema';
@@ -132,7 +132,7 @@ app.use((err, req, res, next) => { // eslint-disable-line no-unused-vars
description={err.message}
style={errorPageStyle._getCss()} // eslint-disable-line no-underscore-dangle
>
- {ReactDOM.renderToString(<ErrorPage error={err} />)}
+ {ReactDOM.renderToString(<ErrorPageWithoutStyle error={err} />)}
</Html>
);
res.status(statusCode);
diff --git a/tools/render.js b/tools/render.js
@@ -7,9 +7,9 @@
* LICENSE.txt file in the root directory of this source tree.
*/
+import fetch from 'node-fetch';
import runServer from './runServer';
import fs from './lib/fs';
-import fetch from 'node-fetch';
import { host } from '../src/config';
// Enter your paths here which you want to render as static
