From 4e11458655917a7ca98c528bde40e2153643c1b1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 1 Jan 2022 20:23:40 -0800 Subject: [PATCH] Bump antd from 4.16.8 to 4.18.0 in /desktop (#3222) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Summary: Bumps [antd](https://github.com/ant-design/ant-design) from 4.16.8 to 4.18.0.
Release notes

Sourced from antd's releases.

4.18.0

... (truncated)

Changelog

Sourced from antd's changelog.

4.18.0

2021-12-27

4.17.4

2021-12-19

4.17.3

2021-12-08

... (truncated)

Commits

[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=antd&package-manager=npm_and_yarn&previous-version=4.16.8&new-version=4.18.0)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `dependabot rebase` will rebase this PR - `dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `dependabot merge` will merge this PR after your CI passes on it - `dependabot squash and merge` will squash and merge this PR after your CI passes on it - `dependabot cancel merge` will cancel a previously requested merge and block automerging - `dependabot reopen` will reopen this PR if it is closed - `dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
Pull Request resolved: https://github.com/facebook/flipper/pull/3222 Reviewed By: timur-valiev Differential Revision: D33348265 Pulled By: nikoant fbshipit-source-id: e219049791c8341b4795fc8b742edaa61ee7559d --- desktop/flipper-ui-core/package.json | 2 +- .../ShareSheetPendingDialog.node.tsx.snap | 2 + .../PluginInstaller.node.tsx.snap | 8 +- .../handleOpenPluginDeeplink.node.tsx | 1 - .../{antd+4.16.8.patch => antd+4.18.0.patch} | 6 +- ...abs+11.9.1.patch => rc-tabs+11.10.5.patch} | 14 +- .../plugins/public/reactdevtools/index.tsx | 2 +- desktop/yarn.lock | 352 ++++++++---------- 8 files changed, 164 insertions(+), 223 deletions(-) rename desktop/patches/{antd+4.16.8.patch => antd+4.18.0.patch} (92%) rename desktop/patches/{rc-tabs+11.9.1.patch => rc-tabs+11.10.5.patch} (78%) diff --git a/desktop/flipper-ui-core/package.json b/desktop/flipper-ui-core/package.json index 5af1a0a08..0c534b564 100644 --- a/desktop/flipper-ui-core/package.json +++ b/desktop/flipper-ui-core/package.json @@ -15,7 +15,7 @@ "@emotion/react": "^11.6.0", "@emotion/styled": "^11.6.0", "@tanishiking/aho-corasick": "^0.0.1", - "antd": "4.16.8", + "antd": "4.18.0", "cbuffer": "^2.2.0", "console-feed": "^3.2.2", "deep-equal": "^2.0.5", diff --git a/desktop/flipper-ui-core/src/chrome/__tests__/__snapshots__/ShareSheetPendingDialog.node.tsx.snap b/desktop/flipper-ui-core/src/chrome/__tests__/__snapshots__/ShareSheetPendingDialog.node.tsx.snap index 1fdfafd28..ab9776ec6 100644 --- a/desktop/flipper-ui-core/src/chrome/__tests__/__snapshots__/ShareSheetPendingDialog.node.tsx.snap +++ b/desktop/flipper-ui-core/src/chrome/__tests__/__snapshots__/ShareSheetPendingDialog.node.tsx.snap @@ -40,6 +40,7 @@ exports[`ShareSheetPendingDialog is rendered with status update 1`] = `
-
`); }); diff --git a/desktop/patches/antd+4.16.8.patch b/desktop/patches/antd+4.18.0.patch similarity index 92% rename from desktop/patches/antd+4.16.8.patch rename to desktop/patches/antd+4.18.0.patch index 2db7e1cd6..654c4667f 100644 --- a/desktop/patches/antd+4.16.8.patch +++ b/desktop/patches/antd+4.18.0.patch @@ -1,8 +1,8 @@ diff --git a/node_modules/antd/es/button/button.js b/node_modules/antd/es/button/button.js -index 28a12c7..13f7382 100644 +index 7202fce..c70b419 100644 --- a/node_modules/antd/es/button/button.js +++ b/node_modules/antd/es/button/button.js -@@ -193,6 +193,8 @@ var InternalButton = function InternalButton(props, ref) { +@@ -187,6 +187,8 @@ var InternalButton = function InternalButton(props, ref) { }, [loadingOrDelay]); React.useEffect(fixTwoCNChar, [buttonRef]); @@ -11,7 +11,7 @@ index 28a12c7..13f7382 100644 var handleClick = function handleClick(e) { var _a; -@@ -204,7 +206,13 @@ var InternalButton = function InternalButton(props, ref) { +@@ -198,7 +200,13 @@ var InternalButton = function InternalButton(props, ref) { return; } diff --git a/desktop/patches/rc-tabs+11.9.1.patch b/desktop/patches/rc-tabs+11.10.5.patch similarity index 78% rename from desktop/patches/rc-tabs+11.9.1.patch rename to desktop/patches/rc-tabs+11.10.5.patch index 6a71270a1..a82943632 100644 --- a/desktop/patches/rc-tabs+11.9.1.patch +++ b/desktop/patches/rc-tabs+11.10.5.patch @@ -1,17 +1,19 @@ diff --git a/node_modules/rc-tabs/es/TabNavList/TabNode.js b/node_modules/rc-tabs/es/TabNavList/TabNode.js -index 092d6cc..0f4ea8c 100644 +index eca033e..7a818d8 100644 --- a/node_modules/rc-tabs/es/TabNavList/TabNode.js +++ b/node_modules/rc-tabs/es/TabNavList/TabNode.js -@@ -37,10 +37,19 @@ function TabNode(_ref, ref) { - } - +@@ -27,13 +27,21 @@ function TabNode(_ref, ref) { + return onRemove; + }, []); var removable = editable && closable !== false && !disabled; + var scope = React.useContext(global.FlipperTrackingScopeContext); function onInternalClick(e) { - if (disabled) return; + if (disabled) { + return; + } + - onClick(e); -+ + global.flipperTrackInteraction( + 'Tabs', + 'onTabClick', diff --git a/desktop/plugins/public/reactdevtools/index.tsx b/desktop/plugins/public/reactdevtools/index.tsx index 3fad67d77..5372663e6 100644 --- a/desktop/plugins/public/reactdevtools/index.tsx +++ b/desktop/plugins/public/reactdevtools/index.tsx @@ -419,7 +419,7 @@ function DevToolsInstanceToolbar() {