From f95ea4a0e9a8da19492ae1e3c5cd2222ef4ba805 Mon Sep 17 00:00:00 2001 From: Tommy Nguyen <4123478+tido64@users.noreply.github.com> Date: Wed, 21 Jun 2023 11:03:04 +0200 Subject: [PATCH 1/3] fix(ios): fix `pod install --project-directory=ios` failing --- packages/react-native/scripts/cocoapods/codegen_utils.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/react-native/scripts/cocoapods/codegen_utils.rb b/packages/react-native/scripts/cocoapods/codegen_utils.rb index 1ea549fa094961..33825d15ce3faa 100644 --- a/packages/react-native/scripts/cocoapods/codegen_utils.rb +++ b/packages/react-native/scripts/cocoapods/codegen_utils.rb @@ -132,7 +132,7 @@ def get_react_codegen_spec(package_json_file, folly_version: '2021.07.22.00', fa "React-jsi": [], "ReactCommon/turbomodule/bridging": [], "ReactCommon/turbomodule/core": [], - "React-NativeModulesApple": [], + "React-NativeModulesApple": [], "glog": [], "DoubleConversion": [], } @@ -316,7 +316,7 @@ def use_react_native_codegen_discovery!( :config_key => config_key ) react_codegen_spec = codegen_utils.get_react_codegen_spec( - file_manager.join(react_native_path, "package.json"), + file_manager.join(relative_installation_root, react_native_path, "package.json"), :folly_version => folly_version, :fabric_enabled => fabric_enabled, :hermes_enabled => hermes_enabled, From d5eae2d309f9a49261af6ad7d4f0ef0dd93edf09 Mon Sep 17 00:00:00 2001 From: Tommy Nguyen <4123478+tido64@users.noreply.github.com> Date: Wed, 21 Jun 2023 11:23:26 +0200 Subject: [PATCH 2/3] update test --- .../scripts/cocoapods/__tests__/codegen_utils-test.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/react-native/scripts/cocoapods/__tests__/codegen_utils-test.rb b/packages/react-native/scripts/cocoapods/__tests__/codegen_utils-test.rb index 297ed18bca59bb..906689127ab933 100644 --- a/packages/react-native/scripts/cocoapods/__tests__/codegen_utils-test.rb +++ b/packages/react-native/scripts/cocoapods/__tests__/codegen_utils-test.rb @@ -373,7 +373,7 @@ def testUseReactCodegenDiscovery_whenParametersAreGood_executeCodegen '[Codegen] warn: using experimental new codegen integration' ]) assert_equal(codegen_utils_mock.get_react_codegen_script_phases_params, [{ - :app_path => "~/app", + :app_path => app_path, :config_file_dir => "", :config_key => "codegenConfig", :fabric_enabled => false, @@ -382,7 +382,7 @@ def testUseReactCodegenDiscovery_whenParametersAreGood_executeCodegen assert_equal(codegen_utils_mock.get_react_codegen_spec_params, [{ :fabric_enabled => false, :folly_version=>"2021.07.22.00", - :package_json_file => "../node_modules/react-native/package.json", + :package_json_file => "#{app_path}../node_modules/react-native/package.json", :script_phases => "echo TestScript" }]) assert_equal(codegen_utils_mock.generate_react_codegen_spec_params, [{ From f67b20b4b0406c34e2273f4d2c0f09456ee2af6b Mon Sep 17 00:00:00 2001 From: Tommy Nguyen <4123478+tido64@users.noreply.github.com> Date: Wed, 21 Jun 2023 11:56:21 +0200 Subject: [PATCH 3/3] fixup! update test --- .../scripts/cocoapods/__tests__/codegen_utils-test.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/react-native/scripts/cocoapods/__tests__/codegen_utils-test.rb b/packages/react-native/scripts/cocoapods/__tests__/codegen_utils-test.rb index 906689127ab933..433b282e74c133 100644 --- a/packages/react-native/scripts/cocoapods/__tests__/codegen_utils-test.rb +++ b/packages/react-native/scripts/cocoapods/__tests__/codegen_utils-test.rb @@ -382,7 +382,7 @@ def testUseReactCodegenDiscovery_whenParametersAreGood_executeCodegen assert_equal(codegen_utils_mock.get_react_codegen_spec_params, [{ :fabric_enabled => false, :folly_version=>"2021.07.22.00", - :package_json_file => "#{app_path}../node_modules/react-native/package.json", + :package_json_file => "#{app_path}/ios/../node_modules/react-native/package.json", :script_phases => "echo TestScript" }]) assert_equal(codegen_utils_mock.generate_react_codegen_spec_params, [{