Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[CCI] Update dropzone dependency #651

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@
"prop-types": "^15.6.0",
"react-ace": "^7.0.5",
"react-beautiful-dnd": "^13.0.0",
"react-dropzone": "^11.2.0",
"react-dropzone": "^14.2.3",
"react-focus-on": "^3.5.0",
"react-input-autosize": "^2.2.2",
"react-is": "~16.3.0",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -191,6 +191,7 @@ exports[`OuiMarkdownEditor is rendered 1`] = `
>
<div
class="ouiMarkdownEditorDropZone"
role="presentation"
joshuarrrr marked this conversation as resolved.
Show resolved Hide resolved
>
<textarea
aria-label="aria-label"
Expand Down Expand Up @@ -219,7 +220,6 @@ exports[`OuiMarkdownEditor is rendered 1`] = `
</button>
</div>
<input
autocomplete="off"
BSFishy marked this conversation as resolved.
Show resolved Hide resolved
multiple=""
style="display:none"
tabindex="-1"
Expand Down Expand Up @@ -421,6 +421,7 @@ exports[`OuiMarkdownEditor props autoExpandPreview is rendered with false 1`] =
>
<div
class="ouiMarkdownEditorDropZone"
role="presentation"
>
<textarea
aria-label="aria-label"
Expand Down Expand Up @@ -449,7 +450,6 @@ exports[`OuiMarkdownEditor props autoExpandPreview is rendered with false 1`] =
</button>
</div>
<input
autocomplete="off"
multiple=""
style="display:none"
tabindex="-1"
Expand Down Expand Up @@ -651,6 +651,7 @@ exports[`OuiMarkdownEditor props height is rendered in full mode 1`] = `
>
<div
class="ouiMarkdownEditorDropZone"
role="presentation"
>
<textarea
aria-label="aria-label"
Expand Down Expand Up @@ -679,7 +680,6 @@ exports[`OuiMarkdownEditor props height is rendered in full mode 1`] = `
</button>
</div>
<input
autocomplete="off"
multiple=""
style="display:none"
tabindex="-1"
Expand Down Expand Up @@ -881,6 +881,7 @@ exports[`OuiMarkdownEditor props height is rendered with a custom size 1`] = `
>
<div
class="ouiMarkdownEditorDropZone"
role="presentation"
>
<textarea
aria-label="aria-label"
Expand Down Expand Up @@ -909,7 +910,6 @@ exports[`OuiMarkdownEditor props height is rendered with a custom size 1`] = `
</button>
</div>
<input
autocomplete="off"
multiple=""
style="display:none"
tabindex="-1"
Expand Down Expand Up @@ -1111,6 +1111,7 @@ exports[`OuiMarkdownEditor props maxHeight is rendered with a custom size 1`] =
>
<div
class="ouiMarkdownEditorDropZone"
role="presentation"
>
<textarea
aria-label="aria-label"
Expand Down Expand Up @@ -1139,7 +1140,6 @@ exports[`OuiMarkdownEditor props maxHeight is rendered with a custom size 1`] =
</button>
</div>
<input
autocomplete="off"
multiple=""
style="display:none"
tabindex="-1"
Expand Down
48 changes: 31 additions & 17 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -3125,10 +3125,10 @@ atob@^2.1.1:
resolved "https://registry.yarnpkg.com/atob/-/atob-2.1.2.tgz#6d9517eb9e030d2436666651e86bd9f6f13533c9"
integrity sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==

attr-accept@^2.0.0:
version "2.1.0"
resolved "https://registry.yarnpkg.com/attr-accept/-/attr-accept-2.1.0.tgz#a231a854385d36ff7a99647bb77b33c8a5175aee"
integrity sha512-sLzVM3zCCmmDtDNhI0i96k6PUztkotSOXqE4kDGQt/6iDi5M+H0srjeF+QC6jN581l4X/Zq3Zu/tgcErEssavg==
attr-accept@^2.2.2:
version "2.2.2"
resolved "https://registry.yarnpkg.com/attr-accept/-/attr-accept-2.2.2.tgz#646613809660110749e92f2c10833b70968d929b"
integrity sha512-7prDjvt9HmqiZ0cl5CRjtS84sEyhsHP2coDkaZKRKVfCDo9s7iw7ChVmar78Gu9pC4SoR/28wFu/G5JJhTnqEg==

autoprefixer@^9.8.6:
version "9.8.6"
Expand Down Expand Up @@ -6745,12 +6745,12 @@ file-name@^0.1.0:
resolved "https://registry.yarnpkg.com/file-name/-/file-name-0.1.0.tgz#12b122f120f9c34dbc176c1ab81a548aced6def7"
integrity sha1-ErEi8SD5w028F2wauBpUis7W3vc=

file-selector@^0.1.12:
version "0.1.12"
resolved "https://registry.yarnpkg.com/file-selector/-/file-selector-0.1.12.tgz#fe726547be219a787a9dcc640575a04a032b1fd0"
integrity sha512-Kx7RTzxyQipHuiqyZGf+Nz4vY9R1XGxuQl/hLoJwq+J4avk/9wxxgZyHKtbyIPJmbD4A66DWGYfyykWNpcYutQ==
file-selector@^0.6.0:
version "0.6.0"
resolved "https://registry.yarnpkg.com/file-selector/-/file-selector-0.6.0.tgz#fa0a8d9007b829504db4d07dd4de0310b65287dc"
integrity sha512-QlZ5yJC0VxHxQQsQhXvBaC7VRJ2uaxTf+Tfpu4Z/OcVQJVpZO+DGU0rkoVW5ce2SccxugvpBJoMvUs59iILYdw==
dependencies:
tslib "^1.9.0"
tslib "^2.4.0"

[email protected]:
version "1.0.0"
Expand Down Expand Up @@ -12614,6 +12614,15 @@ prop-types@^15.5.8, prop-types@^15.6.0, prop-types@^15.6.2, prop-types@^15.7.2:
object-assign "^4.1.1"
react-is "^16.8.1"

prop-types@^15.8.1:
version "15.8.1"
resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.8.1.tgz#67d87bf1a694f48435cf332c24af10214a3140b5"
integrity sha512-oj87CgZICdulUohogVAR7AjlC0327U4el4L6eAvOqCeudMDVU0NThNaV+b9Df4dXgSP1gXMTnPdhfe/2qDH5cg==
dependencies:
loose-envify "^1.4.0"
object-assign "^4.1.1"
react-is "^16.13.1"

property-information@^5.0.0, property-information@^5.3.0:
version "5.5.0"
resolved "https://registry.yarnpkg.com/property-information/-/property-information-5.5.0.tgz#4dc075d493061a82e2b7d096f406e076ed859943"
Expand Down Expand Up @@ -12911,14 +12920,14 @@ react-dom@^16.12.0:
prop-types "^15.6.2"
scheduler "^0.18.0"

react-dropzone@^11.2.0:
version "11.2.0"
resolved "https://registry.yarnpkg.com/react-dropzone/-/react-dropzone-11.2.0.tgz#4e54fa3479e6b6bb93f67914e4a27f1260807fdb"
integrity sha512-S/qaXQHCCg7MVlcrhqd05MLC6DupITLUB0CFn3iCLs6OTjzxdGDF1WTktTe5Jyq8jZdxYfMHNUZOHL0mg+K0Dw==
react-dropzone@^14.2.3:
version "14.2.3"
resolved "https://registry.yarnpkg.com/react-dropzone/-/react-dropzone-14.2.3.tgz#0acab68308fda2d54d1273a1e626264e13d4e84b"
integrity sha512-O3om8I+PkFKbxCukfIR3QAGftYXDZfOE2N1mr/7qebQJHs7U+/RSL/9xomJNpRg9kM5h9soQSdf0Gc7OHF5Fug==
dependencies:
attr-accept "^2.0.0"
file-selector "^0.1.12"
prop-types "^15.7.2"
attr-accept "^2.2.2"
file-selector "^0.6.0"
prop-types "^15.8.1"

react-fast-compare@^3.1.1:
version "3.2.0"
Expand Down Expand Up @@ -13543,7 +13552,7 @@ request-promise-native@^1.0.5:
stealthy-require "^1.1.1"
tough-cookie "^2.3.3"

request@^2.87.0, request@^2.88.0:
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I believe this was also done in #652, need to keep an eye on this so we don't get merge conflicts

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

same change, should be OK.

request@^2.87.0:
version "2.88.0"
resolved "https://registry.yarnpkg.com/request/-/request-2.88.0.tgz#9c2fca4f7d35b592efe57c7f0a55e81052124fef"
integrity sha512-NAqBSrijGLZdM0WZNsInLJpkJokL72XYjUpnB0iwsRgxh7dB6COrHnTBNwN0E+lHDAJzu7kLAkDeY08z2/A0hg==
Expand Down Expand Up @@ -15389,6 +15398,11 @@ tslib@^2.1.0:
resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.4.0.tgz#7cecaa7f073ce680a05847aa77be941098f36dc3"
integrity sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==

tslib@^2.4.0:
version "2.5.0"
resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.5.0.tgz#42bfed86f5787aeb41d031866c8f402429e0fddf"
integrity sha512-336iVw3rtn2BUK7ORdIAHTyxHGRIHVReokCR3XjbckJMK7ms8FysBfhLR8IXnAgy7T0PTPNBWKiH514FOW/WSg==

tsutils@^3.17.1:
version "3.17.1"
resolved "https://registry.yarnpkg.com/tsutils/-/tsutils-3.17.1.tgz#ed719917f11ca0dee586272b2ac49e015a2dd759"
Expand Down