Skip to content

Commit

Permalink
Update ESLint settings
Browse files Browse the repository at this point in the history
  • Loading branch information
koistya committed Apr 16, 2015
1 parent c5d640f commit 58af610
Show file tree
Hide file tree
Showing 6 changed files with 19 additions and 9 deletions.
9 changes: 8 additions & 1 deletion .eslintrc
Original file line number Diff line number Diff line change
@@ -1,13 +1,20 @@
{
"parser": "babel-eslint",
"plugins": [
"react"
],
"env": {
"browser": true,
"node": true
"node": true,
"es6": true
},
"globals": {
"__DEV__": true,
"__SERVER__": true
},
"ecmaFeatures": {
"jsx": true
},
"rules": {
// Strict mode
"strict": [2, "never"],
Expand Down
1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
"del": "^1.1.1",
"eslint": "^0.19.0",
"eslint-loader": "^0.10.0",
"eslint-plugin-react": "^2.1.0",
"git-push": "^0.1.0",
"gulp": "^3.8.11",
"gulp-autoprefixer": "^2.1.0",
Expand Down
8 changes: 5 additions & 3 deletions src/components/App/setViewport.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@
* LICENSE.txt file in the root directory of this source tree.
*/

import React, { Component } from 'react';
import React, { Component } from 'react'; // eslint-disable-line no-unused-vars
import { canUseDOM } from 'react/lib/ExecutionEnvironment';

export default function setViewport(ComposedComponent) {
function setViewport(ComposedComponent) {
return class AppViewport extends Component {

constructor() {
Expand Down Expand Up @@ -45,4 +45,6 @@ export default function setViewport(ComposedComponent) {
}

};
};
}

export default setViewport;
2 changes: 1 addition & 1 deletion src/components/ContentPage/ContentPage.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
*/

import './ContentPage.less';
import React, { PropTypes } from 'react';
import React, { PropTypes } from 'react'; // eslint-disable-line no-unused-vars

class ContentPage {

Expand Down
4 changes: 2 additions & 2 deletions src/components/Navbar/Navbar.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@
* LICENSE.txt file in the root directory of this source tree.
*/

import React, { Component } from 'react';
import React from 'react'; // eslint-disable-line no-unused-vars

class Navbar extends Component {
class Navbar {

render() {
return (
Expand Down
4 changes: 2 additions & 2 deletions src/components/NotFoundPage/NotFoundPage.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@
*/

//import './NotFoundPage.less';
import React, { Component } from 'react';
import React from 'react'; // eslint-disable-line no-unused-vars

class NotFoundPage extends Component {
class NotFoundPage {

render() {
return (
Expand Down

0 comments on commit 58af610

Please sign in to comment.