Skip to content

Commit

Permalink
Merge pull request BiosBoy#13 from BiosBoy/test-b
Browse files Browse the repository at this point in the history
test commit
  • Loading branch information
BiosBoy authored Jan 3, 2019
2 parents 96a8cc0 + ca5355e commit b2e4379
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 13 deletions.
24 changes: 12 additions & 12 deletions .eslintrc
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
"parser": "babel-eslint",
"plugins": [
"react",
"import",
"react-hooks",
"import",
"jest"
],
"env": {
Expand All @@ -19,7 +19,7 @@
],
"import/resolver": {
"webpack": {
"config": "./config/webpackConfigFactory.js"
"config": "./webpack.config.js"
},
"node": {
"paths": [
Expand All @@ -30,19 +30,19 @@
},
"react": {
"pragma": "React",
"version": "16.3"
"version": "16.7"
}
},
"globals": {
"jest": true,
"react_disableWarnings": true,
"react_enableWarnings": true,
"__NODE_ENV__": false,
"__PORT__": false,
"__DEV__": false,
"__TEST__": false,
"__PROD__": false,
"__COVERAGE__": false
"jest": true,
"react_disableWarnings": true,
"react_enableWarnings": true,
"__NODE_ENV__": false,
"__PORT__": false,
"__DEV__": false,
"__TEST__": false,
"__PROD__": false,
"__COVERAGE__": false
},
"rules": {
"react-hooks/rules-of-hooks": "error",
Expand Down
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
# 0.6.0
* Major update of dependencies and devDependencies.
* Updated eslint config.
* Updated tslint config..
* Updated tslint config.

# 0.5.0
* Integrated React-Routing for app routring.
Expand Down

0 comments on commit b2e4379

Please sign in to comment.