Skip to content

Commit

Permalink
chore(build): npm updates
Browse files Browse the repository at this point in the history
  • Loading branch information
cdcabrera committed Aug 26, 2019
1 parent 2afffc5 commit b2368dc
Show file tree
Hide file tree
Showing 4 changed files with 1,912 additions and 2,138 deletions.
7 changes: 5 additions & 2 deletions .eslintrc
Original file line number Diff line number Diff line change
Expand Up @@ -57,10 +57,13 @@
"printWidth": 120
}
],
"react/no-unused-prop-types": 1,
"react/jsx-filename-extension": 0,
"react/forbid-prop-types": 0,
"react/jsx-filename-extension": 0,
"react/jsx-fragments": [ 1, "element" ],
"react/jsx-props-no-spreading": 0,
"react/jsx-one-expression-per-line": 0,
"react/no-unused-prop-types": 1,
"react/state-in-constructor": [ 1, "never" ],
"space-before-function-paren": 0,
"jsx-a11y/anchor-is-valid": 1,
"jsx-a11y/label-has-for": [ 2, {
Expand Down
19 changes: 8 additions & 11 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -89,16 +89,16 @@
"locale-code": "^2.0.2",
"lodash": "^4.17.15",
"moment": "^2.24.0",
"numeral": "^2.0.6",
"node-sass": "^4.12.0",
"numeral": "^2.0.6",
"prop-types": "^15.7.2",
"react": "^16.8.6",
"react-dom": "^16.8.6",
"react-i18next": "^10.11.4",
"react": "^16.9.0",
"react-dom": "^16.9.0",
"react-i18next": "^10.12.2",
"react-redux": "^7.1.0",
"react-router": "^5.0.1",
"react-router-dom": "^5.0.1",
"react-scripts": "3.0.1",
"react-scripts": "3.1.1",
"redux": "^4.0.4",
"redux-logger": "^3.0.6",
"redux-promise-middleware": "^6.1.1",
Expand All @@ -110,10 +110,10 @@
"enzyme": "^3.10.0",
"enzyme-adapter-react-16": "^1.14.0",
"enzyme-to-json": "^3.4.0",
"eslint-config-airbnb": "^17.1.1",
"eslint-config-prettier": "^6.0.0",
"eslint-config-airbnb": "^18.0.1",
"eslint-config-prettier": "^6.1.0",
"eslint-plugin-import": "^2.18.2",
"eslint-plugin-jest": "^22.15.0",
"eslint-plugin-jest": "^22.15.2",
"eslint-plugin-json": "^1.4.0",
"eslint-plugin-jsx-a11y": "^6.2.3",
"eslint-plugin-prettier": "^3.1.0",
Expand All @@ -127,8 +127,5 @@
"standard-version": "^7.0.0",
"swagger-ui-express": "^4.0.7",
"yamljs": "^0.3.0"
},
"resolutions": {
"**/eslint": "5.16.0"
}
}
13 changes: 5 additions & 8 deletions src/services/config.js
Original file line number Diff line number Diff line change
@@ -1,10 +1,7 @@
const serviceConfig = (passedConfig = {}) =>
Object.assign(
{
headers: {},
timeout: process.env.REACT_APP_AJAX_TIMEOUT
},
passedConfig
);
const serviceConfig = (passedConfig = {}) => ({
headers: {},
timeout: process.env.REACT_APP_AJAX_TIMEOUT,
...passedConfig
});

export { serviceConfig as default, serviceConfig };
Loading

0 comments on commit b2368dc

Please sign in to comment.