Skip to content

Commit

Permalink
Merge pull request #162 from debragail/testing
Browse files Browse the repository at this point in the history
update eslint and package.json
  • Loading branch information
debragail authored Feb 22, 2019
2 parents 6a6389c + d65f58f commit 42b5103
Show file tree
Hide file tree
Showing 2 changed files with 30 additions and 6 deletions.
23 changes: 23 additions & 0 deletions .eslintrc.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
module.exports = {
"env": {
"browser": true,
"es6": true
},
"extends": "google",
"globals": {
"Atomics": "readonly",
"SharedArrayBuffer": "readonly"
},
"parserOptions": {
"ecmaFeatures": {
"jsx": true
},
"ecmaVersion": 2018,
"sourceType": "module"
},
"plugins": [
"react"
],
"rules": {
}
};
13 changes: 7 additions & 6 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
},
"devDependencies": {
"babel-core": "^6.26.3",
"babel-jest": "^23.0.1",
"babel-jest": "^24.1.0",
"babel-loader": "^7.1.4",
"babel-plugin-transform-object-rest-spread": "^6.26.0",
"babel-polyfill": "^6.26.0",
Expand All @@ -30,13 +30,14 @@
"clean-webpack-plugin": "^0.1.19",
"copy-webpack-plugin": "^4.5.1",
"css-loader": "^0.28.11",
"eslint": "^4.19.1",
"eslint": "^5.14.1",
"eslint-config-google": "^0.12.0",
"eslint-loader": "^2.0.0",
"eslint-plugin-react": "^7.9.1",
"eslint-plugin-react": "^7.12.4",
"extract-text-webpack-plugin": "^3.0.2",
"html-webpack-plugin": "^2.30.1",
"jest": "^23.1.0",
"jest-cli": "^23.1.0",
"jest": "^24.1.0",
"jest-cli": "^24.1.0",
"prettier": "^1.13.5",
"react": "^16.4.1",
"react-dom": "^16.4.1",
Expand All @@ -50,7 +51,7 @@
"url-loader": "^1.0.1",
"web3": "^1.0.0-beta.34",
"webpack": "^3.11.0",
"webpack-dev-server": "^2.11.1",
"webpack-dev-server": "^3.2.0",
"webpack-merge": "^4.1.3"
}
}

0 comments on commit 42b5103

Please sign in to comment.