commit 9a78f9c1c01f50ba73ab52379633ee0058e7bcf3
parent d8b96de8b2dd58beb7237ecdf1346f18780b4eaa
Author: Konstantin Tarkus <hello@tarkus.me>
Date: Thu, 27 Aug 2015 05:03:11 +0300
Update npm modules
flux 2.0.3 -> 2.1.1: https://github.com/facebook/flux/blob/master/CHANGELOG.md
babel-eslint 4.0.5 -> 4.1.0: https://github.com/babel/babel-eslint/commits/master
css-loader 0.15.6 -> 0.16.0: https://github.com/webpack/css-loader/commits/master
eslint 1.1.0 -> 1.2.1: https://github.com/eslint/eslint/blob/master/CHANGELOG.md
eslint-plugin-react 3.2.2 -> 3.3.0: https://github.com/yannickcr/eslint-plugin-react/blob/master/History.md
jest-cli 0.4.18 -> 0.5.0: https://github.com/facebook/jest/blob/master/CHANGELOG.md
postcss 4.1.16 -> 0.5.0: https://github.com/postcss/postcss/blob/master/CHANGELOG.md
postcss-nested 0.3.2 -> 1.0.0: https://github.com/postcss/postcss-nested/blob/master/CHANGELOG.md
webpack 1.11.0 -> 1.12.0: https://github.com/webpack/webpack/commits/master
webpack-hot-middleware 1.2.0 -> 2.0.0: https://github.com/glenjamin/webpack-hot-middleware#changelog
Diffstat:
5 files changed, 26 insertions(+), 28 deletions(-)
diff --git a/.eslintrc b/.eslintrc
@@ -26,6 +26,10 @@
// React
"react/display-name": 0,
"react/jsx-boolean-value": 1,
+ "react/jsx-closing-bracket-location": 1,
+ "react/jsx-curly-spacing": 1,
+ "react/jsx-max-props-per-line": 0,
+ "react/jsx-indent-props": 0,
"react/jsx-no-duplicate-props": 1,
"react/jsx-no-undef": 1,
"react/jsx-quotes": 1,
@@ -34,6 +38,7 @@
"react/jsx-uses-react": 1,
"react/jsx-uses-vars": 1,
"react/no-danger": 0,
+ "react/no-set-state": 1,
"react/no-did-mount-set-state": 1,
"react/no-did-update-set-state": 1,
"react/no-multi-comp": 1,
diff --git a/.travis.yml b/.travis.yml
@@ -1,9 +1,4 @@
+sudo: false
language: node_js
node_js:
- iojs
- - '0.12'
- - '0.10'
-matrix:
- allow_failures:
- - node_js: iojs
- - node_js: '0.12'
diff --git a/package.json b/package.json
@@ -1,7 +1,8 @@
{
"private": true,
"engines": {
- "node": ">= 0.10",
+ "node": ">= 0.12",
+ "iojs": ">= 3.0",
"npm": ">= 2.1"
},
"dependencies": {
@@ -10,8 +11,8 @@
"eventemitter3": "1.1.1",
"express": "4.13.3",
"fastclick": "1.0.6",
- "fbjs": "0.1.0-alpha.7",
- "flux": "2.0.3",
+ "fbjs": "0.1.0-alpha.10",
+ "flux": "2.1.1",
"front-matter": "1.0.0",
"history": "1.8.0",
"jade": "1.11.0",
@@ -25,34 +26,34 @@
},
"devDependencies": {
"autoprefixer-core": "^5.2.1",
- "babel-eslint": "^4.0.5",
+ "babel-eslint": "^4.1.0",
"babel-loader": "^5.3.2",
"browser-sync": "^2.8.2",
- "css-loader": "^0.15.6",
+ "css-loader": "^0.16.0",
"csscomb": "^3.1.8",
- "cssnext": "^1.8.3",
- "del": "^1.2.0",
- "eslint": "^1.1.0",
+ "cssnext": "^1.8.4",
+ "del": "^1.2.1",
+ "eslint": "^1.2.1",
"eslint-loader": "^1.0.0",
- "eslint-plugin-react": "^3.2.2",
+ "eslint-plugin-react": "^3.3.0",
"gaze": "^0.5.1",
"git-push": "^0.1.1",
"glob": "^5.0.14",
- "jest-cli": "^0.4.18",
+ "jest-cli": "^0.5.0",
"mkdirp": "^0.5.1",
"ncp": "^2.0.0",
- "postcss": "^4.1.16",
+ "postcss": "^5.0.2",
"postcss-loader": "^0.5.1",
- "postcss-nested": "^0.3.2",
+ "postcss-nested": "^1.0.0",
"psi": "^1.0.6",
- "react-hot-loader": "^1.2.8",
+ "react-hot-loader": "^1.2.9",
"replace": "^0.3.0",
"run-sequence": "^1.1.2",
"style-loader": "^0.12.3",
"url-loader": "^0.5.6",
- "webpack": "^1.11.0",
+ "webpack": "^1.12.0",
"webpack-dev-middleware": "^1.2.0",
- "webpack-hot-middleware": "^1.2.0"
+ "webpack-hot-middleware": "^2.0.0"
},
"jest": {
"rootDir": "./src",
diff --git a/src/Router.js b/src/Router.js
@@ -31,7 +31,8 @@ const router = new Router(on => {
on('error', (state, error) => state.statusCode === 404 ?
<App context={state.context} error={error}><NotFoundPage /></App> :
- <App context={state.context} error={error}><ErrorPage /></App>);
+ <App context={state.context} error={error}><ErrorPage /></App>
+ );
});
diff --git a/tools/config.js b/tools/config.js
@@ -50,7 +50,7 @@ const config = {
reasons: DEBUG,
hash: VERBOSE,
version: VERBOSE,
- timings: VERBOSE,
+ timings: true,
chunks: VERBOSE,
chunkModules: VERBOSE,
cached: VERBOSE,
@@ -103,11 +103,7 @@ const config = {
// -----------------------------------------------------------------------------
const appConfig = merge({}, config, {
- entry: [...(WATCH ? [
- 'webpack/hot/dev-server',
- 'webpack-hot-middleware/client'] : []),
- './src/app.js'
- ],
+ entry: [...(WATCH ? ['webpack-hot-middleware/client'] : []), './src/app.js'],
output: {
path: path.join(__dirname, '../build/public'),
filename: 'app.js'
