Skip to content

Commit

Permalink
linting and dep upgrades
Browse files Browse the repository at this point in the history
  • Loading branch information
erikras committed Jan 26, 2016
1 parent f5af56c commit aa065e7
Show file tree
Hide file tree
Showing 2 changed files with 26 additions and 12 deletions.
20 changes: 17 additions & 3 deletions .eslintrc
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,22 @@
"node": true
},
"rules": {
"react/jsx-quotes": 0,
"react/jsx-uses-react": 2,
"react/jsx-uses-vars": 2,
"react/react-in-jsx-scope": 2,
"comma-dangle": 0, // not sure why airbnb turned this on. gross!
"indent": [2, 2, {"SwitchCase": 1}]
}
"indent": [2, 2, {"SwitchCase": 1}],
"spaced-comment": 0,
"no-redeclare": 0,
"no-console": 2,

//Temporarirly disabled due to a possible bug in babel-eslint (todomvc example)
"block-scoped-var": 0,
// Temporarily disabled for test/* until babel/babel-eslint#33 is resolved
"padded-blocks": 0
},
"plugins": [
"react"
]
}

18 changes: 9 additions & 9 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
"clean": "rimraf dist lib",
"lint": "eslint src",
"prepublish": "npm run lint && npm run test && npm run clean && npm run build",
"test": "mocha --compilers js:babel-core/register --recursive --require ./test/setup.js"
"test": "npm run lint && mocha --compilers js:babel-core/register --recursive --require ./test/setup.js"
},
"keywords": [
"react",
Expand All @@ -34,28 +34,28 @@
"homepage": "https://github.com/erikras/multireducer",
"devDependencies": {
"babel": "^6.0.15",
"babel-cli": "^6.0.15",
"babel-core": "^6.0.16",
"babel-cli": "^6.4.5",
"babel-core": "^6.4.5",
"babel-eslint": "^4.1.3",
"babel-loader": "^6.0.1",
"babel-plugin-syntax-class-properties": "^6.0.14",
"babel-plugin-transform-class-properties": "^6.0.14",
"babel-preset-es2015": "^6.0.15",
"babel-preset-react": "^6.0.15",
"babel-preset-stage-0": "^6.0.15",
"eslint": "^1.8.0",
"eslint": "^1.10.3",
"eslint-config-airbnb": "^0.1.0",
"eslint-plugin-react": "^3.6.3",
"eslint-plugin-react": "^3.13.1",
"expect": "^1.12.2",
"jsdom": "5.0.0",
"jsdom": "^7.2.2",
"mocha": "^2.3.3",
"react": "^0.14.1",
"react-addons-test-utils": "^0.14.3",
"react-redux": "^4.0.0",
"redux": "^3.0.4",
"redux": "^3.0.6",
"rifraf": "^2.0.2",
"rimraf": "^2.4.3",
"webpack": "^1.12.2"
"rimraf": "^2.5.1",
"webpack": "^1.12.12"
},
"peerDependencies": {
"react-redux": "^3.0.0 || ^4.0.0",
Expand Down

0 comments on commit aa065e7

Please sign in to comment.