From e43accc14d53fe434fe3f4f186a9fe207a1aadb3 Mon Sep 17 00:00:00 2001 From: ElenaDiachenko Date: Mon, 18 Mar 2024 13:11:23 +0200 Subject: [PATCH 1/3] fix/flipper_xcode_15.3 --- .../engine-rn-tvos/templates/platforms/tvos/Podfile | 13 +++++++++++++ packages/engine-rn/templates/platforms/ios/Podfile | 13 +++++++++++++ 2 files changed, 26 insertions(+) diff --git a/packages/engine-rn-tvos/templates/platforms/tvos/Podfile b/packages/engine-rn-tvos/templates/platforms/tvos/Podfile index f221c517b1..92afdc3633 100644 --- a/packages/engine-rn-tvos/templates/platforms/tvos/Podfile +++ b/packages/engine-rn-tvos/templates/platforms/tvos/Podfile @@ -82,6 +82,19 @@ post_install do |installer| :mac_catalyst_enabled => false ) {{INJECT_POST_INSTALL}} + + installer.pods_project.targets.each do |target| + if target.name == 'Flipper' + file_path = 'Pods/Flipper/xplat/Flipper/FlipperTransportTypes.h' + contents = File.read(file_path) + unless contents.include?('#include ') + File.open(file_path, 'w') do |file| + file.puts('#include ') + file.puts(contents) + end + end + end + end end {{INJECT_PLUGIN_PODFILE_INJECT}} \ No newline at end of file diff --git a/packages/engine-rn/templates/platforms/ios/Podfile b/packages/engine-rn/templates/platforms/ios/Podfile index 80770050c4..93c1d15fcf 100755 --- a/packages/engine-rn/templates/platforms/ios/Podfile +++ b/packages/engine-rn/templates/platforms/ios/Podfile @@ -65,6 +65,19 @@ target 'RNVApp' do :mac_catalyst_enabled => false ) {{INJECT_POST_INSTALL}} + + installer.pods_project.targets.each do |target| + if target.name == 'Flipper' + file_path = 'Pods/Flipper/xplat/Flipper/FlipperTransportTypes.h' + contents = File.read(file_path) + unless contents.include?('#include ') + File.open(file_path, 'w') do |file| + file.puts('#include ') + file.puts(contents) + end + end + end + end end end From 9dde48745202a64b112776143ba862900643eb27 Mon Sep 17 00:00:00 2001 From: pauliusguzas Date: Mon, 18 Mar 2024 15:29:22 +0200 Subject: [PATCH 2/3] fix: change e2e selector because renative text has been removed from mobiles --- packages/app-harness/src/app/index.tsx | 2 +- packages/app-harness/test/specs/e2e.cjs | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/app-harness/src/app/index.tsx b/packages/app-harness/src/app/index.tsx index 85193e0a18..428f1387cc 100644 --- a/packages/app-harness/src/app/index.tsx +++ b/packages/app-harness/src/app/index.tsx @@ -52,7 +52,7 @@ const AppContent = () => { ReNative Harness diff --git a/packages/app-harness/test/specs/e2e.cjs b/packages/app-harness/test/specs/e2e.cjs index d1fa07c02b..04d4e695ab 100644 --- a/packages/app-harness/test/specs/e2e.cjs +++ b/packages/app-harness/test/specs/e2e.cjs @@ -5,7 +5,7 @@ describe('Test App Harness', () => { FlexnRunner.launchApp(); }); - it('--> check if element has correct text in Home Page', async () => { - await FlexnRunner.expectToHaveTextById('app-harness-home-screen-intro-text', 'ReNative Harness'); + it('--> check if ReNative logo is displayed in Home Page', async () => { + await FlexnRunner.expectToBeDisplayedById('app-harness-home-screen-renative-image'); }); }); From 8bc33a3e53793256edf4d055dffa896adff4c995 Mon Sep 17 00:00:00 2001 From: ElenaDiachenko Date: Tue, 19 Mar 2024 16:45:44 +0200 Subject: [PATCH 3/3] make flipper usage configurable --- packages/core/src/schema/platforms/fragments/android.ts | 1 + packages/sdk-react-native/src/env.ts | 7 +++++++ packages/sdk-react-native/src/iosRunner.ts | 1 + 3 files changed, 9 insertions(+) diff --git a/packages/core/src/schema/platforms/fragments/android.ts b/packages/core/src/schema/platforms/fragments/android.ts index 44c73f0e8a..825219105e 100644 --- a/packages/core/src/schema/platforms/fragments/android.ts +++ b/packages/core/src/schema/platforms/fragments/android.ts @@ -87,4 +87,5 @@ export const PlatformAndroidFragment = { storeFile: z.string().describe('Name of the store file in android project').optional(), keyAlias: z.string().describe('Key alias of the store file in android project').optional(), newArchEnabled: z.boolean().optional().describe('Enables new arch for android. Default: false'), + flipperEnabled: z.boolean().optional().describe('Enables flipper for ios. Default: true'), }; diff --git a/packages/sdk-react-native/src/env.ts b/packages/sdk-react-native/src/env.ts index eaa544a605..841badac77 100644 --- a/packages/sdk-react-native/src/env.ts +++ b/packages/sdk-react-native/src/env.ts @@ -31,6 +31,13 @@ export const EnvVars = { } return {}; }, + RNV_FLIPPER_ENABLED: () => { + const enableFlipper = getConfigProp('flipperEnabled', true); + if (!enableFlipper) { + return { NO_FLIPPER: '1' }; + } + return {}; + }, RNV_SKIP_LINKING: () => { const skipPlugins: string[] = []; parsePlugins( diff --git a/packages/sdk-react-native/src/iosRunner.ts b/packages/sdk-react-native/src/iosRunner.ts index 09314c940e..062859d098 100644 --- a/packages/sdk-react-native/src/iosRunner.ts +++ b/packages/sdk-react-native/src/iosRunner.ts @@ -198,6 +198,7 @@ export const runCocoaPods = async () => { ...EnvVars.RNV_REACT_NATIVE_PATH(), ...EnvVars.RCT_NEW_ARCH_ENABLED(), ...EnvVars.RNV_SKIP_LINKING(), + ...EnvVars.RNV_FLIPPER_ENABLED(), }; if (c.program.updatePods) {