From c09106790252bc20ef13bd4d747ba6e1133d25dc Mon Sep 17 00:00:00 2001 From: Andrey Goncharov Date: Wed, 30 Aug 2023 07:26:35 -0700 Subject: [PATCH] Update antd Summary: Project doc: https://docs.google.com/document/d/1miofxds9DJgWScj0zFyBbdpRH5Rj0T9FqiCapof5-vU Required to get `Space.Compact` allow-large-files Reviewed By: passy Differential Revision: D48520383 fbshipit-source-id: 000a5c16c00541455dc4a31c4fddb2c4c252a89e --- desktop/flipper-plugin/package.json | 2 +- .../src/ui/PowerSearch/index.tsx | 2 +- .../src/ui/__tests__/DataFormatter.node.tsx | 20 +- desktop/flipper-ui-core/package.json | 2 +- .../ShareSheetPendingDialog.node.tsx.snap | 8 +- .../__tests__/LaunchEmulator.spec.tsx | 2 +- .../{antd+4.19.2.patch => antd+4.24.13.patch} | 38 +- desktop/patches/rc-collapse+3.1.0.patch | 24 - desktop/patches/rc-collapse+3.4.2.patch | 18 + ...bs+11.10.5.patch => rc-tabs+12.5.10.patch} | 12 +- desktop/plugins/package.json | 2 +- desktop/yarn.lock | 470 ++++++++++-------- 12 files changed, 334 insertions(+), 266 deletions(-) rename desktop/patches/{antd+4.19.2.patch => antd+4.24.13.patch} (56%) delete mode 100644 desktop/patches/rc-collapse+3.1.0.patch create mode 100644 desktop/patches/rc-collapse+3.4.2.patch rename desktop/patches/{rc-tabs+11.10.5.patch => rc-tabs+12.5.10.patch} (77%) diff --git a/desktop/flipper-plugin/package.json b/desktop/flipper-plugin/package.json index 5a59360d1..8fbd7ef0a 100644 --- a/desktop/flipper-plugin/package.json +++ b/desktop/flipper-plugin/package.json @@ -34,7 +34,7 @@ "peerDependencies": { "@ant-design/icons": "^4.2.2", "@testing-library/dom": "^7.26.3", - "antd": "^4.23.4" + "antd": "^4.24" }, "scripts": { "reset": "rimraf lib *.tsbuildinfo", diff --git a/desktop/flipper-plugin/src/ui/PowerSearch/index.tsx b/desktop/flipper-plugin/src/ui/PowerSearch/index.tsx index b9ffdb9da..f9bef6126 100644 --- a/desktop/flipper-plugin/src/ui/PowerSearch/index.tsx +++ b/desktop/flipper-plugin/src/ui/PowerSearch/index.tsx @@ -94,7 +94,7 @@ export const PowerSearch: React.FC = ({config}) => { }, ]); }} - value={null} + value={''} /> ); diff --git a/desktop/flipper-plugin/src/ui/__tests__/DataFormatter.node.tsx b/desktop/flipper-plugin/src/ui/__tests__/DataFormatter.node.tsx index b78acbdf6..d52574492 100644 --- a/desktop/flipper-plugin/src/ui/__tests__/DataFormatter.node.tsx +++ b/desktop/flipper-plugin/src/ui/__tests__/DataFormatter.node.tsx @@ -92,11 +92,11 @@ test('linkify formatter', () => { expect(linkify('https://www.google.com')).toMatchInlineSnapshot(` - https://www.google.com - + `); @@ -107,11 +107,11 @@ test('linkify formatter', () => { expect(linkify('test https://www.google.com test')).toMatchInlineSnapshot(` test - https://www.google.com - + test `); @@ -119,17 +119,17 @@ test('linkify formatter', () => { .toMatchInlineSnapshot(` - https://www.google.com - + test - http://fb.com - + `); @@ -162,11 +162,11 @@ test('jsonify formatter', () => { { "hello": " - http://facebook.com - + " } diff --git a/desktop/flipper-ui-core/package.json b/desktop/flipper-ui-core/package.json index 70e3060ee..ac4c127f0 100644 --- a/desktop/flipper-ui-core/package.json +++ b/desktop/flipper-ui-core/package.json @@ -15,7 +15,7 @@ "@emotion/react": "^11.8.2", "@emotion/styled": "^11.10.4", "@tanishiking/aho-corasick": "^0.0.1", - "antd": "4.19.2", + "antd": "^4.24", "cbuffer": "^2.2.0", "deep-equal": "^2.2.2", "@nicksrandall/console-feed": "^3.5.0", 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 dc41860cf..1aff655f7 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 @@ -11,6 +11,8 @@ exports[`ShareSheetPendingDialog is rendered with status update 1`] = ` } >