Skip to content

Commit

Permalink
Merge pull request #1337 from sharetribe/update-dependencies
Browse files Browse the repository at this point in the history
Update dependencies
  • Loading branch information
Gnito authored Aug 11, 2020
2 parents 8dc2bb3 + 5c80a2f commit 84e1d5f
Show file tree
Hide file tree
Showing 6 changed files with 1,038 additions and 634 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ way to update this template, but currently, we follow a pattern:

## Upcoming version 2020-XX-XX

- [change] Some dependency updates [#1337](https://github.com/sharetribe/ftw-daily/pull/1337)
- [fix] Use Stripe's `confirmCardPayment` function instead of deprecated `handleCardPayment` to
confirm PaymentIntent. In addition to the rename, the arguments passed to `handleCardPayment` are
sligthly different. Otherwise, these changes should not affect the behavior of the function.
Expand Down
50 changes: 25 additions & 25 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,50 +5,50 @@
"license": "Apache-2.0",
"dependencies": {
"@formatjs/intl-relativetimeformat": "^4.2.1",
"@mapbox/polyline": "^1.0.0",
"@sentry/browser": "5.7.1",
"@sentry/node": "5.7.1",
"array-includes": "^3.0.3",
"@mapbox/polyline": "^1.1.1",
"@sentry/browser": "5.20.1",
"@sentry/node": "5.20.1",
"array-includes": "^3.1.1",
"array.prototype.find": "^2.1.1",
"autosize": "^4.0.0",
"basic-auth": "^2.0.1",
"body-parser": "^1.18.3",
"classnames": "^2.2.6",
"compression": "^1.7.4",
"cookie-parser": "^1.4.5",
"core-js": "^3.1.4",
"core-js": "^3.6.5",
"cors": "^2.8.5",
"decimal.js": "10.2.0",
"dotenv": "6.2.0",
"dotenv-expand": "4.2.0",
"express": "^4.16.4",
"express-enforces-ssl": "^1.1.0",
"express-sitemap": "^1.8.0",
"final-form": "^4.18.5",
"final-form": "^4.20.1",
"final-form-arrays": "^3.0.2",
"full-icu": "^1.3.1",
"helmet": "^3.21.2",
"intl-pluralrules": "^1.0.3",
"lodash": "^4.17.14",
"lodash": "^4.17.19",
"mapbox-gl-multitouch": "^1.0.3",
"moment": "^2.22.2",
"object.entries": "^1.1.1",
"object.entries": "^1.1.2",
"object.values": "^1.1.1",
"path-to-regexp": "^3.0.0",
"prop-types": "^15.7.2",
"query-string": "^5.1.1",
"query-string": "^6.13.1",
"raf": "^3.4.0",
"react": "^16.9.0",
"react": "^16.13.1",
"react-dates": "^21.3.1",
"react-dom": "^16.9.0",
"react-final-form": "^6.3.0",
"react-final-form-arrays": "^3.1.1",
"react-dom": "^16.13.1",
"react-final-form": "^6.5.1",
"react-final-form-arrays": "^3.1.2",
"react-google-maps": "^9.4.5",
"react-helmet-async": "^1.0.6",
"react-intl": "^3.1.13",
"react-moment-proptypes": "^1.6.0",
"react-redux": "^7.1.1",
"react-router-dom": "^5.0.1",
"react-redux": "^7.2.1",
"react-router-dom": "^5.2.0",
"redux": "^4.0.5",
"redux-thunk": "^2.3.0",
"seedrandom": "^3.0.5",
Expand All @@ -61,19 +61,19 @@
"devDependencies": {
"babel-jest": "24.9.0",
"bfj": "^7.0.2",
"chalk": "^2.4.1",
"concurrently": "^5.2.0",
"enzyme": "^3.9.0",
"enzyme-adapter-react-16": "^1.12.0",
"enzyme-to-json": "^3.4.4",
"inquirer": "^7.0.0",
"nodemon": "^1.17.2",
"chalk": "^v4.1.0",
"concurrently": "^5.3.0",
"enzyme": "^3.11.0",
"enzyme-adapter-react-16": "^1.15.2",
"enzyme-to-json": "^3.5.0",
"inquirer": "^7.3.3",
"nodemon": "^2.0.4",
"prettier": "^1.18.2"
},
"resolutions": {
"react-dates/lodash": "^4.17.14",
"react-google-maps/lodash": "^4.17.14",
"react-test-renderer": "^16.9.0",
"react-dates/lodash": "^4.17.19",
"react-google-maps/lodash": "^4.17.19",
"react-test-renderer": "^16.13.1",
"handlebars": "^4.5.3",
"serialize-javascript": "^2.1.1"
},
Expand Down
2 changes: 1 addition & 1 deletion src/components/FieldDateInput/FieldDateInput.js
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ class FieldDateInputComponent extends Component {
[css.pickerError]: hasError,
});

const { onBlur, onFocus, type, ...restOfInput } = input;
const { onBlur, onFocus, type, checked, ...restOfInput } = input;
const inputProps = {
onBlur: input.onBlur,
onFocus: input.onFocus,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import DateRangeController from './DateRangeController';

const component = props => {
const { input, controllerRef, ...rest } = props;
const { type, ...restOfInput } = input;
const { type, checked, ...restOfInput } = input;
return <DateRangeController ref={controllerRef} {...restOfInput} {...rest} />;
};

Expand Down
2 changes: 1 addition & 1 deletion src/components/FieldDateRangeInput/FieldDateRangeInput.js
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ class FieldDateRangeInputComponent extends Component {
) : null;

// eslint-disable-next-line no-unused-vars
const { onBlur, onFocus, type, ...restOfInput } = input;
const { onBlur, onFocus, type, checked, ...restOfInput } = input;
const inputProps = {
unitType,
onBlur: this.handleBlur,
Expand Down
Loading

0 comments on commit 84e1d5f

Please sign in to comment.