commit b0376867d95e4f2eaa6a032abb807e2e1be9c332
parent 1185ffbb4d977413906fe327180c4818e50be0c8
Author: Konstantin Tarkus <hello@tarkus.me>
Date: Tue, 15 Sep 2015 05:00:51 +0300
Update npm modules, cssnext, eslint settings
Diffstat:
7 files changed, 40 insertions(+), 32 deletions(-)
diff --git a/.eslintrc b/.eslintrc
@@ -1,4 +1,5 @@
{
+ "extends": "eslint:recommended",
"parser": "babel-eslint",
"plugins": [
"react"
diff --git a/package.json b/package.json
@@ -11,10 +11,10 @@
"eventemitter3": "1.1.1",
"express": "4.13.3",
"fastclick": "1.0.6",
- "fbjs": "0.2.0",
+ "fbjs": "0.2.1",
"flux": "2.1.1",
"front-matter": "1.0.0",
- "history": "1.8.4",
+ "history": "1.9.1",
"jade": "1.11.0",
"lodash": "3.10.1",
"normalize.css": "3.0.3",
@@ -25,25 +25,26 @@
"superagent": "1.3.0"
},
"devDependencies": {
- "autoprefixer-core": "^5.2.1",
- "babel-eslint": "^4.1.1",
+ "autoprefixer": "^6.0.2",
+ "babel-eslint": "^4.1.2",
"babel-loader": "^5.3.2",
- "browser-sync": "^2.9.2",
- "css-loader": "^0.17.0",
+ "browser-sync": "^2.9.3",
+ "css-loader": "^0.18.0",
"csscomb": "^3.1.8",
- "cssnext": "^1.8.4",
- "del": "^2.0.1",
- "eslint": "^1.3.1",
+ "del": "^2.0.2",
+ "eslint": "^1.4.1",
"eslint-loader": "^1.0.0",
- "eslint-plugin-react": "^3.3.1",
+ "eslint-plugin-react": "^3.3.2",
"gaze": "^0.5.1",
"git-push": "^0.1.1",
"glob": "^5.0.14",
- "jest-cli": "^0.5.1",
+ "jest-cli": "^0.5.4",
"mkdirp": "^0.5.1",
"ncp": "^2.0.0",
- "postcss": "^5.0.4",
- "postcss-loader": "^0.5.1",
+ "postcss": "^5.0.5",
+ "postcss-cssnext": "^2.0.1",
+ "postcss-import": "^7.0.0",
+ "postcss-loader": "^0.6.0",
"postcss-nested": "^1.0.0",
"psi": "^1.0.6",
"react-hot-loader": "^1.3.0",
@@ -53,7 +54,7 @@
"url-loader": "^0.5.6",
"webpack": "^1.12.1",
"webpack-dev-middleware": "^1.2.0",
- "webpack-hot-middleware": "^2.0.0"
+ "webpack-hot-middleware": "^2.0.1"
},
"jest": {
"rootDir": "./src",
diff --git a/src/app.js b/src/app.js
@@ -3,10 +3,8 @@
import 'babel/polyfill';
import ReactDOM from 'react-dom';
import FastClick from 'fastclick';
-import Dispatcher from './core/Dispatcher';
import Router from './Router';
import Location from './core/Location';
-import ActionTypes from './constants/ActionTypes';
import { addEventListener, removeEventListener } from './utils/DOMUtils';
let appContainer = document.getElementById('app');
diff --git a/src/decorators/withViewport.js b/src/decorators/withViewport.js
@@ -49,7 +49,7 @@ function withViewport(ComposedComponent) {
}
handleResize(value) {
- this.setState({viewport: value});
+ this.setState({viewport: value}); // eslint-disable-line react/no-set-state
}
};
diff --git a/src/server.js b/src/server.js
@@ -55,6 +55,7 @@ server.get('*', async (req, res, next) => {
// -----------------------------------------------------------------------------
server.listen(server.get('port'), () => {
+ /* eslint-disable no-console */
console.log('The server is running at http://localhost:' + server.get('port'));
if (process.send) {
process.send('online');
diff --git a/tools/.eslintrc b/tools/.eslintrc
@@ -0,0 +1,5 @@
+{
+ "rules": {
+ "no-console": 0
+ }
+}
diff --git a/tools/config.js b/tools/config.js
@@ -12,19 +12,17 @@ import webpack, { DefinePlugin, BannerPlugin } from 'webpack';
import merge from 'lodash/object/merge';
const DEBUG = !process.argv.includes('release');
-const WATCH = global.WATCH === undefined ? false : global.WATCH;
const VERBOSE = process.argv.includes('verbose');
-const STYLE_LOADER = 'style-loader/useable';
-const CSS_LOADER = DEBUG ? 'css-loader' : 'css-loader?minimize';
+const WATCH = global.WATCH === undefined ? false : global.WATCH;
const AUTOPREFIXER_BROWSERS = [
'Android 2.3',
'Android >= 4',
- 'Chrome >= 20',
- 'Firefox >= 24',
- 'Explorer >= 8',
- 'iOS >= 6',
+ 'Chrome >= 35',
+ 'Firefox >= 31',
+ 'Explorer >= 9',
+ 'iOS >= 7',
'Opera >= 12',
- 'Safari >= 6'
+ 'Safari >= 7.1'
];
const GLOBALS = {
'process.env.NODE_ENV': DEBUG ? '"development"' : '"production"',
@@ -88,11 +86,15 @@ const config = {
}]
},
- postcss: [
- require('postcss-nested')(),
- require('cssnext')(),
- require('autoprefixer-core')(AUTOPREFIXER_BROWSERS)
- ]
+ postcss: function() {
+ return [
+ require('postcss-import')({
+ onImport: files => files.forEach(this.addDependency)
+ }),
+ require('postcss-nested')(),
+ require('postcss-cssnext')({autoprefixer: AUTOPREFIXER_BROWSERS})
+ ];
+ }
};
//
@@ -124,7 +126,7 @@ const appConfig = merge({}, config, {
module: {
loaders: [...config.module.loaders, {
test: /\.css$/,
- loader: `${STYLE_LOADER}!${CSS_LOADER}!postcss-loader`
+ loader: 'style-loader/useable!css-loader!postcss-loader'
}]
}
});
@@ -168,7 +170,7 @@ const serverConfig = merge({}, config, {
module: {
loaders: [...config.module.loaders, {
test: /\.css$/,
- loader: `${CSS_LOADER}!postcss-loader`
+ loader: 'css-loader!postcss-loader'
}]
}
});
