Skip to content

Commit

Permalink
WIP DO NOT MERGE update eslint version on webpack-config
Browse files Browse the repository at this point in the history
  • Loading branch information
Christopher Joe authored and flamerohr committed Sep 12, 2017
1 parent e952672 commit 8fee2e9
Show file tree
Hide file tree
Showing 4 changed files with 789 additions and 429 deletions.
14 changes: 0 additions & 14 deletions .eslintrc

This file was deleted.

66 changes: 66 additions & 0 deletions .eslintrc.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,66 @@
{
"extends": "airbnb",
"env": {
"jasmine": true
},
"rules": {
"no-underscore-dangle": [
"off",
{
"allow": [
"_t"
],
"allowAfterThis": true
}
],
"no-unused-vars": [
"error",
{
"vars": "local"
}
],
"react/forbid-prop-types": [
"off"
]
"comma-dangle": [
"off"
],
"arrow-parens": [
"off"
],
"indent": [
"off"
],
"react/no-danger": [
"off"
],
"import/prefer-default-export": [
"off"
],
"import/first": [
"off"
],
"class-methods-use-this": [
"off"
]
},
"settings": {
"import/extensions": [
".js",
".jsx"
],
"import/resolver": {
"node": {
"extensions": [
".js",
".jsx"
],
"moduleDirectory": [
".",
"client/src",
"node_modules"
]
}
}
}
}
16 changes: 8 additions & 8 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
"homepage": "https://github.com/silverstripe/silverstripe-admin",
"dependencies": {
"apollo-client": "^0.5.5",
"babel-polyfill": "^6.23.0",
"babel-polyfill": "^6.26.0",
"bootstrap": "4.0.0-beta",
"chosen-js": "^1.5.1",
"classnames": "^2.2.5",
Expand All @@ -55,6 +55,7 @@
"qs": "^6.1.0",
"react": "15.3.1",
"react-addons-css-transition-group": "15.3.1",
"react-addons-test-utils": "15.3.1",
"react-apollo": "^0.7.0",
"react-bootstrap-ss": "^0.30.10",
"react-dnd": "^2.2.3",
Expand All @@ -73,17 +74,16 @@
"validator": "^6.1.0"
},
"devDependencies": {
"@silverstripe/webpack-config": "^0.2.9",
"babel-core": "^6.24.1",
"@silverstripe/webpack-config": "file:../../webpack-config",
"babel-core": "^6.26.0",
"babel-jest": "^20.0.3",
"babel-preset-es2015": "^6.24.1",
"babel-preset-es2016": "^6.24.1",
"babel-preset-react": "^6.24.1",
"eslint": "^2.5.3",
"eslint-config-airbnb": "^6.2.0",
"eslint-plugin-react": "^4.2.3",
"jest-cli": "^19.0.2",
"react-addons-test-utils": "15.3.1"
"jest-cli": "^19.0.2"
},
"resolutions": {
"eslint": "^4.6.1"
},
"jest": {
"roots": [
Expand Down
Loading

0 comments on commit 8fee2e9

Please sign in to comment.