diff --git a/desktop/app/package.json b/desktop/app/package.json index c59d22560..2be2b6b4f 100644 --- a/desktop/app/package.json +++ b/desktop/app/package.json @@ -24,7 +24,7 @@ "JSONStream": "^1.3.1", "adbkit": "^2.11.1", "adbkit-logcat": "^2.0.1", - "antd": "^4.12.2", + "antd": "^4.15.4", "archiver": "^5.0.2", "async-mutex": "^0.3.1", "axios": "^0.21.1", diff --git a/desktop/patches/antd+4.12.2.patch b/desktop/patches/antd+4.15.4.patch similarity index 70% rename from desktop/patches/antd+4.12.2.patch rename to desktop/patches/antd+4.15.4.patch index ea4b8574e..0d212f1ca 100644 --- a/desktop/patches/antd+4.12.2.patch +++ b/desktop/patches/antd+4.15.4.patch @@ -1,5 +1,5 @@ diff --git a/node_modules/antd/es/button/button.js b/node_modules/antd/es/button/button.js -index 7b9490c..99067b6 100644 +index c96d188..06a814b 100644 --- a/node_modules/antd/es/button/button.js +++ b/node_modules/antd/es/button/button.js @@ -189,6 +189,8 @@ var InternalButton = function InternalButton(props, ref) { @@ -9,18 +9,19 @@ index 7b9490c..99067b6 100644 + var scope = React.useContext(global.FlipperTrackingScopeContext); + var handleClick = function handleClick(e) { - var onClick = props.onClick; + var _a; -@@ -197,7 +199,11 @@ var InternalButton = function InternalButton(props, ref) { +@@ -200,6 +202,13 @@ var InternalButton = function InternalButton(props, ref) { + return; } - if (onClick) { -- onClick(e); ++ if(onClick !== null && onClick !== void 0) { + global.flipperTrackInteraction( -+ 'Button', 'onClick', scope, props.title || props.children || props.icon, ++ 'Button', 'onClick', scope, props.title || props.children || props.icon, + onClick, + e + ); - } ++ } + (_a = onClick) === null || _a === void 0 ? void 0 : _a(e); }; diff --git a/desktop/yarn.lock b/desktop/yarn.lock index 80d5f5b74..86794b36b 100644 --- a/desktop/yarn.lock +++ b/desktop/yarn.lock @@ -124,13 +124,6 @@ "@algolia/logger-common" "4.9.1" "@algolia/requester-common" "4.9.1" -"@ant-design/colors@^5.0.0": - version "5.0.0" - resolved "https://registry.yarnpkg.com/@ant-design/colors/-/colors-5.0.0.tgz#46b73b4cc6935b35fc8b84555e8e42c8cfc190e6" - integrity sha512-Pe1rYorgVC1v4f+InDXvIlQH715pO1g7BsOhy/ehX/U6ebPKqojmkYJKU3lF+84Zmvyar7ngZ28hesAa1nWjLg== - dependencies: - "@ctrl/tinycolor" "^3.1.6" - "@ant-design/colors@^6.0.0": version "6.0.0" resolved "https://registry.yarnpkg.com/@ant-design/colors/-/colors-6.0.0.tgz#9b9366257cffcc47db42b9d0203bb592c13c0298" @@ -143,7 +136,7 @@ resolved "https://registry.yarnpkg.com/@ant-design/icons-svg/-/icons-svg-4.1.0.tgz#480b025f4b20ef7fe8f47d4a4846e4fee84ea06c" integrity sha512-Fi03PfuUqRs76aI3UWYpP864lkrfPo0hluwGqh7NJdLhvH4iRDc3jbJqZIvRDLHKbXrvAfPPV3+zjUccfFvWOQ== -"@ant-design/icons@^4.4.0", "@ant-design/icons@^4.6.2": +"@ant-design/icons@^4.6.2": version "4.6.2" resolved "https://registry.yarnpkg.com/@ant-design/icons/-/icons-4.6.2.tgz#290f2e8cde505ab081fda63e511e82d3c48be982" integrity sha512-QsBG2BxBYU/rxr2eb8b2cZ4rPKAPBpzAR+0v6rrZLp/lnyvflLH3tw1vregK+M7aJauGWjIGNdFmUfpAOtw25A== @@ -1253,7 +1246,7 @@ exec-sh "^0.3.2" minimist "^1.2.0" -"@ctrl/tinycolor@^3.1.6", "@ctrl/tinycolor@^3.4.0": +"@ctrl/tinycolor@^3.4.0": version "3.4.0" resolved "https://registry.yarnpkg.com/@ctrl/tinycolor/-/tinycolor-3.4.0.tgz#c3c5ae543c897caa9c2a68630bed355be5f9990f" integrity sha512-JZButFdZ1+/xAfpguQHoabIXkcqRRKpMrWKBkpEZZyxfY9C1DpADFB8PEqGSTeFr135SaTRfKqGKx5xSCLI7ZQ== @@ -3271,51 +3264,51 @@ ansicolors@~0.3.2: resolved "https://registry.yarnpkg.com/ansicolors/-/ansicolors-0.3.2.tgz#665597de86a9ffe3aa9bfbe6cae5c6ea426b4979" integrity sha1-ZlWX3oap/+Oqm/vmyuXG6kJrSXk= -antd@^4.12.2: - version "4.12.2" - resolved "https://registry.yarnpkg.com/antd/-/antd-4.12.2.tgz#3e00b21de418c94a358bf1fc064de15654a30161" - integrity sha512-xB7sGg2qM/Sl3azjbc2RbJQ6cTr2Fos0AYZw2gTLLWtKhOyO3FUH7EBsL17GOkVnEDwMmBYtVXLhMgPM+e4gbA== +antd@^4.15.4: + version "4.15.4" + resolved "https://registry.yarnpkg.com/antd/-/antd-4.15.4.tgz#43d0a2d821412f5765dc5eec765c817effcae79d" + integrity sha512-1c0ykHGomcd7QhEeRtynxN3i7fb7JBdnEq2/Yqhf7yzMIhGSfZm+h+A2lTqMOMheCVL6q2ie7lxqhtNLq6sWoQ== dependencies: - "@ant-design/colors" "^5.0.0" - "@ant-design/icons" "^4.4.0" + "@ant-design/colors" "^6.0.0" + "@ant-design/icons" "^4.6.2" "@ant-design/react-slick" "~0.28.1" "@babel/runtime" "^7.12.5" array-tree-filter "^2.1.0" classnames "^2.2.6" copy-to-clipboard "^3.2.0" - lodash "^4.17.20" + lodash "^4.17.21" moment "^2.25.3" rc-cascader "~1.4.0" rc-checkbox "~2.3.0" rc-collapse "~3.1.0" rc-dialog "~8.5.1" - rc-drawer "~4.2.0" + rc-drawer "~4.3.0" rc-dropdown "~3.2.0" - rc-field-form "~1.18.0" - rc-image "~5.2.0" - rc-input-number "~6.2.0" + rc-field-form "~1.20.0" + rc-image "~5.2.4" + rc-input-number "~7.1.0" rc-mentions "~1.5.0" rc-menu "~8.10.0" rc-motion "^2.4.0" rc-notification "~4.5.2" - rc-pagination "~3.1.2" - rc-picker "~2.5.1" + rc-pagination "~3.1.6" + rc-picker "~2.5.10" rc-progress "~3.1.0" rc-rate "~2.9.0" rc-resize-observer "^1.0.0" - rc-select "~12.1.0" + rc-select "~12.1.6" rc-slider "~9.7.1" rc-steps "~4.1.0" rc-switch "~3.2.0" rc-table "~7.13.0" rc-tabs "~11.7.0" rc-textarea "~0.3.0" - rc-tooltip "~5.0.0" + rc-tooltip "~5.1.0" rc-tree "~4.1.0" rc-tree-select "~4.3.0" rc-trigger "^5.2.1" - rc-upload "~3.3.4" - rc-util "^5.7.0" + rc-upload "~4.2.0-alpha.0" + rc-util "^5.9.4" scroll-into-view-if-needed "^2.2.25" warning "^4.0.3" @@ -4879,11 +4872,6 @@ date-fns@^2.15.0: resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-2.16.1.tgz#05775792c3f3331da812af253e1a935851d3834b" integrity sha512-sAJVKx/FqrLYHAQeN7VpJrPhagZc9R4ImZIWYRFZaaohR3KzmuK88touwsSwSVT8Qcbd4zoDsnGfX4GFB4imyQ== -dayjs@^1.8.30: - version "1.8.35" - resolved "https://registry.yarnpkg.com/dayjs/-/dayjs-1.8.35.tgz#67118378f15d31623f3ee2992f5244b887606888" - integrity sha512-isAbIEenO4ilm6f8cpqvgjZCsuerDAz2Kb7ri201AiNn58aqXuaLJEnCtfIMdCvERZHNGRY5lDMTr/jdAnKSWQ== - debug@2.6.9, debug@^2.2.0, debug@^2.3.3, debug@^2.6.0, debug@^2.6.8, debug@^2.6.9, debug@~2.6.3: version "2.6.9" resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f" @@ -8870,7 +8858,7 @@ lodash.zip@^4.2.0: resolved "https://registry.yarnpkg.com/lodash.zip/-/lodash.zip-4.2.0.tgz#ec6662e4896408ed4ab6c542a3990b72cc080020" integrity sha1-7GZi5IlkCO1KtsVCo5kLcswIACA= -lodash@4.x, lodash@^4.0.1, lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.13, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.19, lodash@^4.17.20, lodash@^4.17.21: +lodash@4.x, lodash@^4.0.1, lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.13, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.19, lodash@^4.17.21: version "4.17.21" resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c" integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg== @@ -10519,10 +10507,10 @@ rc-dialog@~8.5.0, rc-dialog@~8.5.1: rc-motion "^2.3.0" rc-util "^5.6.1" -rc-drawer@~4.2.0: - version "4.2.2" - resolved "https://registry.yarnpkg.com/rc-drawer/-/rc-drawer-4.2.2.tgz#5fd8b18ce20575ff22b36e0c5ddbe363c13db555" - integrity sha512-zw48FATkAmJrEnfeRWiMqvKAzqGzUDLN1UXlluB7q7GgbR6mJFvc+QsmNrgxsFuMz86Lh9mKSIi7rXlPINmuzw== +rc-drawer@~4.3.0: + version "4.3.1" + resolved "https://registry.yarnpkg.com/rc-drawer/-/rc-drawer-4.3.1.tgz#356333a7af01b777abd685c96c2ce62efb44f3f3" + integrity sha512-GMfFy4maqxS9faYXEhQ+0cA1xtkddEQzraf6SAdzWbn444DrrLogwYPk1NXSpdXjLCLxgxOj9MYtyYG42JsfXg== dependencies: "@babel/runtime" "^7.10.1" classnames "^2.2.6" @@ -10537,33 +10525,33 @@ rc-dropdown@^3.1.3, rc-dropdown@~3.2.0: classnames "^2.2.6" rc-trigger "^5.0.4" -rc-field-form@~1.18.0: - version "1.18.1" - resolved "https://registry.yarnpkg.com/rc-field-form/-/rc-field-form-1.18.1.tgz#41027816c80d1acf6f51db085d34c2c35213a701" - integrity sha512-/YRnelnHLxygl/ROGhFqfCT+uAZ5xLvu3qjtlETOneb7fXKk7tqp+RGfYqZ4uNViXlsfxox3qqMMTVet6wYfEA== +rc-field-form@~1.20.0: + version "1.20.0" + resolved "https://registry.yarnpkg.com/rc-field-form/-/rc-field-form-1.20.0.tgz#2201092095429f7f020825462835c4086d2baf16" + integrity sha512-jkzsIfXR7ywEYdeAtktt1aLff88wxIPDLpq7KShHNl4wlsWrCE+TzkXBfjvVzYOVZt5GGrD8YDqNO/q6eaR/eA== dependencies: "@babel/runtime" "^7.8.4" async-validator "^3.0.3" - rc-util "^5.0.0" + rc-util "^5.8.0" -rc-image@~5.2.0: - version "5.2.2" - resolved "https://registry.yarnpkg.com/rc-image/-/rc-image-5.2.2.tgz#08ab21ffce90563cc1459aed14d940d638189f15" - integrity sha512-Zv8Qyftw5P2nbqaueUOX1Fq1c5XlY/hTEWzUxINQh+qt/K1e5vF5sriTy1KH9B6GY4LVwIk4oHweDJemCWYDcw== +rc-image@~5.2.4: + version "5.2.4" + resolved "https://registry.yarnpkg.com/rc-image/-/rc-image-5.2.4.tgz#ff1059f937bde6ca918c6f1beb316beba911f255" + integrity sha512-kWOjhZC1OoGKfvWqtDoO9r8WUNswBwnjcstI6rf7HMudz0usmbGvewcWqsOhyaBRJL9+I4eeG+xiAoxV1xi75Q== dependencies: "@babel/runtime" "^7.11.2" classnames "^2.2.6" rc-dialog "~8.5.0" rc-util "^5.0.6" -rc-input-number@~6.2.0: - version "6.2.0" - resolved "https://registry.yarnpkg.com/rc-input-number/-/rc-input-number-6.2.0.tgz#8e34ce0fb1078ffd237151dac2b7a66cdc9996f9" - integrity sha512-EaDkGvJN1YZdLntY2isYjHejgX6hDCcW8Te7hIGsVp3Egzn179s1PVVLQmSEfT1YC+bf+SE5EZOpw0IH7dq33w== +rc-input-number@~7.1.0: + version "7.1.0" + resolved "https://registry.yarnpkg.com/rc-input-number/-/rc-input-number-7.1.0.tgz#fd5f7f00d7e6c2761cf1eaf025bddb2bb522d4a6" + integrity sha512-ewgtKZaDmwbOWX8DXBGV+amp1IiGS8G+5xDqn85CK1BiQMwsQdrmMEqNkbTdxO8EmYbwN1iQQ4t82IkAaIoa3A== dependencies: "@babel/runtime" "^7.10.1" classnames "^2.2.5" - rc-util "^5.0.1" + rc-util "^5.9.8" rc-mentions@~1.5.0: version "1.5.1" @@ -10621,23 +10609,22 @@ rc-overflow@^1.0.0: rc-resize-observer "^1.0.0" rc-util "^5.5.1" -rc-pagination@~3.1.2: - version "3.1.2" - resolved "https://registry.yarnpkg.com/rc-pagination/-/rc-pagination-3.1.2.tgz#ab5eacd9c51f869e350d2245064babe91bc1f046" - integrity sha512-KbJvkTvRiD51vTIAi0oTARPUHNb0iV6njbDBe8yLkc3PWYDJaszASfuss6YJ98EIxEeGzuEk6xsUAEKWRJgz2g== +rc-pagination@~3.1.6: + version "3.1.6" + resolved "https://registry.yarnpkg.com/rc-pagination/-/rc-pagination-3.1.6.tgz#db3c06e50270b52fe272ac527c1fdc2c8d28af1f" + integrity sha512-Pb2zJEt8uxXzYCWx/2qwsYZ3vSS9Eqdw0cJBli6C58/iYhmvutSBqrBJh51Z5UzYc5ZcW5CMeP5LbbKE1J3rpw== dependencies: "@babel/runtime" "^7.10.1" classnames "^2.2.1" -rc-picker@~2.5.1: - version "2.5.2" - resolved "https://registry.yarnpkg.com/rc-picker/-/rc-picker-2.5.2.tgz#36d91b8cdddbf8b2474af29c2853b77502a7fb01" - integrity sha512-rQLgvjyFrxjiWlR+Q7CyXdTOP/gHbiXlBca7irOtuEb6HMRLdm+/OfIB7xaaPHgdkv1ZOsxCk8zCEX6j0qf24g== +rc-picker@~2.5.10: + version "2.5.10" + resolved "https://registry.yarnpkg.com/rc-picker/-/rc-picker-2.5.10.tgz#0db17c535a37abbe5d016bdcdfb13d6626f802d0" + integrity sha512-d2or2jql9SSY8CaRPybpbKkXBq3bZ6g88UKyWQZBLTCrc92Xm87RfRC/P3UEQo/CLmia3jVF7IXVi1HmNe2DZA== dependencies: "@babel/runtime" "^7.10.1" classnames "^2.2.1" date-fns "^2.15.0" - dayjs "^1.8.30" moment "^2.24.0" rc-trigger "^5.0.4" rc-util "^5.4.0" @@ -10680,17 +10667,17 @@ rc-resize-observer@^1.0.0: rc-util "^5.0.0" resize-observer-polyfill "^1.5.1" -rc-select@^12.0.0, rc-select@~12.1.0: - version "12.1.2" - resolved "https://registry.yarnpkg.com/rc-select/-/rc-select-12.1.2.tgz#7f5f06838b8a8c86516acb66ead26adbc55fbc16" - integrity sha512-WEcqj4ljz5kgp/yPN4RDQEZRvjGkwdk1PugpFrtd6tY+YqwKZs7vSZt6xphVIvWlmtwmZMe7e9G1U8XykUN0+g== +rc-select@^12.0.0, rc-select@~12.1.6: + version "12.1.10" + resolved "https://registry.yarnpkg.com/rc-select/-/rc-select-12.1.10.tgz#66ce43192751190b7c0e9a0ab1ef79606421ce30" + integrity sha512-LQdUhYncvcULlrNcAShYicc1obPtnNK7/rvCD+YCm0b2BLLYxl3M3b/HOX6o+ppPej+yZulkUPeU6gcgcp9nag== dependencies: "@babel/runtime" "^7.10.1" classnames "2.x" rc-motion "^2.0.1" rc-overflow "^1.0.0" rc-trigger "^5.0.4" - rc-util "^5.0.1" + rc-util "^5.9.8" rc-virtual-list "^3.2.0" rc-slider@~9.7.1: @@ -10755,10 +10742,10 @@ rc-textarea@^0.3.0, rc-textarea@~0.3.0: omit.js "^2.0.0" rc-resize-observer "^0.2.3" -rc-tooltip@^5.0.1, rc-tooltip@~5.0.0: - version "5.0.1" - resolved "https://registry.yarnpkg.com/rc-tooltip/-/rc-tooltip-5.0.1.tgz#b82c4259604d2cb62ca610ed7932dd37fc6ef61d" - integrity sha512-3AnxhUS0j74xAV3khrKw8o6rg+Ima3nw09DJBezMPnX3ImQUAnayWsPSlN1mEnihjA43rcFkGM1emiKE+CXyMQ== +rc-tooltip@^5.0.1, rc-tooltip@~5.1.0: + version "5.1.1" + resolved "https://registry.yarnpkg.com/rc-tooltip/-/rc-tooltip-5.1.1.tgz#94178ed162d0252bc4993b725f5dc2ac0fccf154" + integrity sha512-alt8eGMJulio6+4/uDm7nvV+rJq9bsfxFDCI0ljPdbuoygUscbsMYb6EQgwib/uqsXQUvzk+S7A59uYHmEgmDA== dependencies: "@babel/runtime" "^7.11.2" rc-trigger "^5.0.0" @@ -10796,19 +10783,19 @@ rc-trigger@^5.0.0, rc-trigger@^5.0.4, rc-trigger@^5.1.2, rc-trigger@^5.2.1: rc-motion "^2.0.0" rc-util "^5.5.0" -rc-upload@~3.3.4: - version "3.3.4" - resolved "https://registry.yarnpkg.com/rc-upload/-/rc-upload-3.3.4.tgz#b0668d18661595c69c0621cec220fd116cc79952" - integrity sha512-v2sirR4JL31UTHD/f0LGUdd+tpFaOVUTPeIEjAXRP9kRN8TFhqOgcXl5ixtyqj90FmtRUmKmafCv0EmhBQUHqQ== +rc-upload@~4.2.0-alpha.0: + version "4.2.0" + resolved "https://registry.yarnpkg.com/rc-upload/-/rc-upload-4.2.0.tgz#5e21cab29f10ecb69d71cfb9055912d0e1e08ee0" + integrity sha512-BXtvBs1PnwLjaUzBBU5z4yb9NMSaxc6mUIoPmS9LUAzaTz12L3TLrwu+8dnopYUiyLmYFS3LEO7aUfEWBqJfSA== dependencies: "@babel/runtime" "^7.10.1" classnames "^2.2.5" rc-util "^5.2.0" -rc-util@^5.0.0, rc-util@^5.0.1, rc-util@^5.0.5, rc-util@^5.0.6, rc-util@^5.0.7, rc-util@^5.2.0, rc-util@^5.2.1, rc-util@^5.4.0, rc-util@^5.5.0, rc-util@^5.5.1, rc-util@^5.6.1, rc-util@^5.7.0, rc-util@^5.9.4: - version "5.9.8" - resolved "https://registry.yarnpkg.com/rc-util/-/rc-util-5.9.8.tgz#dfcacc1f7b7c45fa18ab786e2b530dd0509073f1" - integrity sha512-typLSHYGf5irvGLYQshs0Ra3aze086h0FhzsAkyirMunYZ7b3Te8gKa5PVaanoHaZa9sS6qx98BxgysoRP+6Tw== +rc-util@^5.0.0, rc-util@^5.0.1, rc-util@^5.0.5, rc-util@^5.0.6, rc-util@^5.0.7, rc-util@^5.2.0, rc-util@^5.2.1, rc-util@^5.4.0, rc-util@^5.5.0, rc-util@^5.5.1, rc-util@^5.6.1, rc-util@^5.7.0, rc-util@^5.8.0, rc-util@^5.9.4, rc-util@^5.9.8: + version "5.12.2" + resolved "https://registry.yarnpkg.com/rc-util/-/rc-util-5.12.2.tgz#41572687a2cd174fdaec028da756d288e398e9f8" + integrity sha512-kzqG2lHY4oZsoj5Svov12K+9wi0xQHvGzfbLlsF1PDEH1aTbgdNTwlE7mejc3MGEr+7bNHa4+T5ZemCS8vQ1Gw== dependencies: "@babel/runtime" "^7.12.5" react-is "^16.12.0"