From 0ec0fea9b396b87d239517cd64a4d568e79729b3 Mon Sep 17 00:00:00 2001 From: Vesa Luusua Date: Mon, 16 Oct 2017 19:09:53 +0300 Subject: [PATCH 1/2] Update react-dates and moment --- package.json | 4 +-- yarn.lock | 95 ++++++++++++++++++++++++++++++---------------------- 2 files changed, 57 insertions(+), 42 deletions(-) diff --git a/package.json b/package.json index 126a297d7c..881919c71c 100644 --- a/package.json +++ b/package.json @@ -15,7 +15,7 @@ "express-enforces-ssl": "^1.1.0", "helmet": "^3.9.0", "lodash": "^4.17.4", - "moment": "(2.10 - 2.14 || ^2.15.1) && < 2.18.0", + "moment": "^2.18.1", "nsp": "^2.8.1", "path-to-regexp": "^2.0.0", "prop-types": "^15.6.0", @@ -24,7 +24,7 @@ "raven-js": "^3.18.1", "react": "^15.6.2", "react-addons-shallow-compare": "^15.6.2", - "react-dates": "^9.0.1", + "react-dates": "^12.0.0", "react-dom": "^15.6.2", "react-google-maps": "^7.3.0", "react-helmet": "^5.2.0", diff --git a/yarn.lock b/yarn.lock index ff4254ec33..47ccfa6d8d 100644 --- a/yarn.lock +++ b/yarn.lock @@ -62,15 +62,18 @@ agent-base@2: extend "~3.0.0" semver "~5.0.1" -airbnb-prop-types@^2.4.1: - version "2.5.2" - resolved "https://registry.yarnpkg.com/airbnb-prop-types/-/airbnb-prop-types-2.5.2.tgz#b32addff17ef10e02b951e59914cf1c24049c80c" +airbnb-prop-types@^2.8.1: + version "2.8.1" + resolved "https://registry.yarnpkg.com/airbnb-prop-types/-/airbnb-prop-types-2.8.1.tgz#b9e31f08a7ed77b213fefc33b53a8c6e1dd8b885" dependencies: - array.prototype.find "^2.0.3" + array.prototype.find "^2.0.4" + function.prototype.name "^1.0.3" has "^1.0.1" is-regex "^1.0.4" object.assign "^4.0.4" object.entries "^1.0.4" + prop-types "^15.5.10" + prop-types-exact "^1.1.1" ajv-keywords@^2.0.0, ajv-keywords@^2.1.0: version "2.1.0" @@ -230,13 +233,6 @@ array-flatten@^2.1.0: version "2.1.1" resolved "https://registry.yarnpkg.com/array-flatten/-/array-flatten-2.1.1.tgz#426bb9da84090c1838d812c8150af20a8331e296" -array-includes@^3.0.2: - version "3.0.2" - resolved "https://registry.yarnpkg.com/array-includes/-/array-includes-3.0.2.tgz#7c867b4d1235c2b5687c874f3344bff4e002beba" - dependencies: - define-properties "^1.1.2" - es-abstract "^1.5.0" - array-includes@^3.0.3: version "3.0.3" resolved "https://registry.yarnpkg.com/array-includes/-/array-includes-3.0.3.tgz#184b48f62d92d7452bb31b323165c7f8bd02266d" @@ -266,7 +262,7 @@ array-unique@^0.2.1: version "0.2.1" resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.2.1.tgz#a1d97ccafcbc2625cc70fadceb36a50c58b01a53" -array.prototype.find@^2.0.3, array.prototype.find@^2.0.4: +array.prototype.find@^2.0.4: version "2.0.4" resolved "https://registry.yarnpkg.com/array.prototype.find/-/array.prototype.find-2.0.4.tgz#556a5c5362c08648323ddaeb9de9d14bc1864c90" dependencies: @@ -1721,9 +1717,9 @@ console-control-strings@^1.0.0, console-control-strings@~1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/console-control-strings/-/console-control-strings-1.1.0.tgz#3d7cf4464db6446ea644bf4b39507f9851008e8e" -consolidated-events@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/consolidated-events/-/consolidated-events-1.0.1.tgz#70f475f4a5d6d20428e702da1b8870d9cc031a14" +consolidated-events@^1.1.0: + version "1.1.1" + resolved "https://registry.yarnpkg.com/consolidated-events/-/consolidated-events-1.1.1.tgz#25395465b35e531395418b7bbecb5ecaf198d179" constants-browserify@^1.0.0: version "1.0.0" @@ -2401,7 +2397,7 @@ error-ex@^1.2.0: dependencies: is-arrayish "^0.2.1" -es-abstract@^1.5.0, es-abstract@^1.6.1, es-abstract@^1.7.0: +es-abstract@^1.6.1, es-abstract@^1.7.0: version "1.7.0" resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.7.0.tgz#dfade774e01bfcd97f96180298c449c8623fb94c" dependencies: @@ -3137,6 +3133,14 @@ function.prototype.name@^1.0.0: function-bind "^1.1.0" is-callable "^1.1.2" +function.prototype.name@^1.0.3: + version "1.0.3" + resolved "https://registry.yarnpkg.com/function.prototype.name/-/function.prototype.name-1.0.3.tgz#0099ae5572e9dd6f03c97d023fd92bcc5e639eac" + dependencies: + define-properties "^1.1.2" + function-bind "^1.1.0" + is-callable "^1.1.3" + functional-red-black-tree@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz#1b0ab3bd553b2a0d6399d29c0e3ea0b252078327" @@ -4019,6 +4023,10 @@ is-symbol@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/is-symbol/-/is-symbol-1.0.1.tgz#3cc59f00025194b6ab2e38dbae6689256b660572" +is-touch-device@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/is-touch-device/-/is-touch-device-1.0.1.tgz#9a2fd59f689e9a9bf6ae9a86924c4ba805a42eab" + is-typedarray@~1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a" @@ -4767,7 +4775,7 @@ lodash@4.16.2: version "4.16.2" resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.16.2.tgz#3e626db827048a699281a8a125226326cfc0e652" -"lodash@>=3.5 <5", lodash@^4.12.0, lodash@^4.14.0, lodash@^4.15.0, lodash@^4.17.2, lodash@^4.17.3, lodash@^4.17.4, lodash@^4.2.0, lodash@^4.2.1, lodash@^4.3.0: +"lodash@>=3.5 <5", lodash@^4.1.1, lodash@^4.12.0, lodash@^4.14.0, lodash@^4.15.0, lodash@^4.17.2, lodash@^4.17.3, lodash@^4.17.4, lodash@^4.2.0, lodash@^4.2.1, lodash@^4.3.0: version "4.17.4" resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.4.tgz#78203a4d1c328ae1d86dca6460e369b57f4055ae" @@ -4989,14 +4997,14 @@ mkdirp@0.5.1, mkdirp@0.5.x, "mkdirp@>=0.5 0", mkdirp@^0.5.0, mkdirp@^0.5.1, mkdi dependencies: minimist "0.0.8" -"moment@(2.10 - 2.14 || ^2.15.1) && < 2.18.0", moment@>=1.6.0: - version "2.17.1" - resolved "https://registry.yarnpkg.com/moment/-/moment-2.17.1.tgz#fed9506063f36b10f066c8b59a144d7faebe1d82" - -moment@2.x.x: +moment@2.x.x, moment@^2.18.1: version "2.19.1" resolved "https://registry.yarnpkg.com/moment/-/moment-2.19.1.tgz#56da1a2d1cbf01d38b7e1afc31c10bcfa1929167" +moment@>=1.6.0: + version "2.17.1" + resolved "https://registry.yarnpkg.com/moment/-/moment-2.17.1.tgz#fed9506063f36b10f066c8b59a144d7faebe1d82" + ms@0.7.1: version "0.7.1" resolved "https://registry.yarnpkg.com/ms/-/ms-0.7.1.tgz#9cd13c03adbff25b65effde7ce864ee952017098" @@ -6210,13 +6218,20 @@ promise@^7.1.1: dependencies: asap "~2.0.3" +prop-types-exact@^1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/prop-types-exact/-/prop-types-exact-1.1.1.tgz#c2620207e4f77f9762fa1835b0387a464bd08978" + dependencies: + has "^1.0.1" + object.assign "^4.0.4" + prop-types@15.5.8: version "15.5.8" resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.5.8.tgz#6b7b2e141083be38c8595aa51fc55775c7199394" dependencies: fbjs "^0.8.9" -prop-types@^15.5.10, prop-types@^15.5.4, prop-types@^15.5.7, prop-types@^15.5.9, prop-types@^15.6.0: +prop-types@^15.5.10, prop-types@^15.5.4, prop-types@^15.5.7, prop-types@^15.5.8, prop-types@^15.5.9, prop-types@^15.6.0: version "15.6.0" resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.6.0.tgz#ceaf083022fc46b4a35f69e13ef75aed0d639856" dependencies: @@ -6379,16 +6394,20 @@ react-addons-test-utils@^15.6.2: version "15.6.2" resolved "https://registry.yarnpkg.com/react-addons-test-utils/-/react-addons-test-utils-15.6.2.tgz#c12b6efdc2247c10da7b8770d185080a7b047156" -react-dates@^9.0.1: - version "9.0.1" - resolved "https://registry.yarnpkg.com/react-dates/-/react-dates-9.0.1.tgz#2734b31bbcc77ff5141703189924ebb6850ffd83" +react-dates@^12.0.0: + version "12.7.0" + resolved "https://registry.yarnpkg.com/react-dates/-/react-dates-12.7.0.tgz#58048317c627d6406376aedbe7aed05bed18d319" dependencies: - airbnb-prop-types "^2.4.1" - array-includes "^3.0.2" + airbnb-prop-types "^2.8.1" classnames "^2.2.5" - consolidated-events "^1.0.1" - react-moment-proptypes "^1.3.0" - react-portal "^3.0.0" + consolidated-events "^1.1.0" + is-touch-device "^1.0.1" + lodash "^4.1.1" + object.assign "^4.0.4" + object.values "^1.0.4" + prop-types "^15.5.10" + react-moment-proptypes "^1.5.0" + react-portal "^3.1.0" react-dev-utils@^4.1.0: version "4.1.0" @@ -6483,21 +6502,17 @@ react-intl@^2.4.0: intl-relativeformat "^2.0.0" invariant "^2.1.1" -react-moment-proptypes@^1.3.0: - version "1.4.0" - resolved "https://registry.yarnpkg.com/react-moment-proptypes/-/react-moment-proptypes-1.4.0.tgz#831e329ebcec6cf794e75852d82d54a03817023f" - dependencies: - moment ">=1.6.0" - react-moment-proptypes@^1.5.0: version "1.5.0" resolved "https://registry.yarnpkg.com/react-moment-proptypes/-/react-moment-proptypes-1.5.0.tgz#4a448cd6479efc5dd509283f361f3753c3abe60e" dependencies: moment ">=1.6.0" -react-portal@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/react-portal/-/react-portal-3.0.0.tgz#9304fce836e8a3216b22588f8dc91b447728f0ae" +react-portal@^3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/react-portal/-/react-portal-3.1.0.tgz#865c44fb72a1da106c649206936559ce891ee899" + dependencies: + prop-types "^15.5.8" react-prop-types-element-of-type@2.2.0: version "2.2.0" From 0b7fb55d5d0f9e4ae8513a7da7daacb4529d6f6c Mon Sep 17 00:00:00 2001 From: Vesa Luusua Date: Mon, 16 Oct 2017 19:30:15 +0300 Subject: [PATCH 2/2] Update react-dates from 9 to 12. Fix for DOM change 'CalendarDay_button' and add new default props --- .../__snapshots__/DateInputField.test.js.snap | 2 +- src/components/DateRangeInputField/DateRangeInput.css | 7 +++++++ src/components/DateRangeInputField/DateRangeInput.js | 8 +++++++- .../__snapshots__/DateRangeInputField.test.js.snap | 6 ++++-- 4 files changed, 19 insertions(+), 4 deletions(-) diff --git a/src/components/DateInputField/__snapshots__/DateInputField.test.js.snap b/src/components/DateInputField/__snapshots__/DateInputField.test.js.snap index 1ac7989ce0..05d941c8e2 100644 --- a/src/components/DateInputField/__snapshots__/DateInputField.test.js.snap +++ b/src/components/DateInputField/__snapshots__/DateInputField.test.js.snap @@ -12,7 +12,7 @@ exports[`DateInput matches snapshot 1`] = ` className="SingleDatePickerInput" >
, @@ -91,6 +96,7 @@ const defaultProps = { // https://momentjs.com/ displayFormat: 'ddd, MMMM D', monthFormat: 'MMMM YYYY', + weekDayFormat: 'dd', phrases: { closeDatePicker: null, // Handled inside component clearDate: null, // Handled inside component diff --git a/src/components/DateRangeInputField/__snapshots__/DateRangeInputField.test.js.snap b/src/components/DateRangeInputField/__snapshots__/DateRangeInputField.test.js.snap index 2414a122e8..8f76739a0f 100644 --- a/src/components/DateRangeInputField/__snapshots__/DateRangeInputField.test.js.snap +++ b/src/components/DateRangeInputField/__snapshots__/DateRangeInputField.test.js.snap @@ -12,7 +12,7 @@ exports[`DateRangeInput matches snapshot 1`] = ` className="DateRangePickerInput" >