From d0cac87c6ea6caf528f0c164d4b43e3cfbb0b0b8 Mon Sep 17 00:00:00 2001
From: TatianaKapos <tatianakapos@microsoft.com>
Date: Thu, 28 Mar 2024 20:03:38 -0700
Subject: [PATCH] Fix [Windows]: Rename utils/jsi files (#43700)

Summary:
This PR: https://github.com/facebook/react-native/pull/42801/files#diff-ff466c93fb60f2b0e79ed187f492c9935349a2b2f2a7300b310e2bb30e31c33e creates a new jsi.h and jsi.cpp file in ReactCommon. On windows, even though the files have different paths, MSVC doesn't allow two files to have the same name in the same project. This PR changes the name of the new jsi.h and jsi.cpp files.

## Changelog:

[General][Fixed] - Rename utils/jsi files

Pull Request resolved: https://github.com/facebook/react-native/pull/43700

Test Plan: tested on windows

Reviewed By: zeyap

Differential Revision: D55491700

Pulled By: arushikesarwani94

fbshipit-source-id: 2995c0602a9528ed0f8e8eb2230945cb6bd516e9
---
 .../react/nativemodule/core/ReactCommon/TurboModuleBinding.cpp  | 2 +-
 .../react-native/ReactCommon/react/runtime/ReactInstance.cpp    | 2 +-
 .../ReactCommon/react/utils/{jsi.cpp => jsi-utils.cpp}          | 2 +-
 .../react-native/ReactCommon/react/utils/{jsi.h => jsi-utils.h} | 0
 4 files changed, 3 insertions(+), 3 deletions(-)
 rename packages/react-native/ReactCommon/react/utils/{jsi.cpp => jsi-utils.cpp} (98%)
 rename packages/react-native/ReactCommon/react/utils/{jsi.h => jsi-utils.h} (100%)

diff --git a/packages/react-native/ReactCommon/react/nativemodule/core/ReactCommon/TurboModuleBinding.cpp b/packages/react-native/ReactCommon/react/nativemodule/core/ReactCommon/TurboModuleBinding.cpp
index e4d1a6e79e5..1bc4d716e9a 100644
--- a/packages/react-native/ReactCommon/react/nativemodule/core/ReactCommon/TurboModuleBinding.cpp
+++ b/packages/react-native/ReactCommon/react/nativemodule/core/ReactCommon/TurboModuleBinding.cpp
@@ -8,7 +8,7 @@
 #include "TurboModuleBinding.h"
 
 #include <cxxreact/SystraceSection.h>
-#include <react/utils/jsi.h>
+#include <react/utils/jsi-utils.h>
 #include <stdexcept>
 #include <string>
 
diff --git a/packages/react-native/ReactCommon/react/runtime/ReactInstance.cpp b/packages/react-native/ReactCommon/react/runtime/ReactInstance.cpp
index c95b10d7575..fdc47330e53 100644
--- a/packages/react-native/ReactCommon/react/runtime/ReactInstance.cpp
+++ b/packages/react-native/ReactCommon/react/runtime/ReactInstance.cpp
@@ -20,7 +20,7 @@
 #include <jsireact/JSIExecutor.h>
 #include <react/featureflags/ReactNativeFeatureFlags.h>
 #include <react/renderer/runtimescheduler/RuntimeSchedulerBinding.h>
-#include <react/utils/jsi.h>
+#include <react/utils/jsi-utils.h>
 #include <iostream>
 #include <memory>
 #include <tuple>
diff --git a/packages/react-native/ReactCommon/react/utils/jsi.cpp b/packages/react-native/ReactCommon/react/utils/jsi-utils.cpp
similarity index 98%
rename from packages/react-native/ReactCommon/react/utils/jsi.cpp
rename to packages/react-native/ReactCommon/react/utils/jsi-utils.cpp
index 4cdc1580d94..e6b3eb10993 100644
--- a/packages/react-native/ReactCommon/react/utils/jsi.cpp
+++ b/packages/react-native/ReactCommon/react/utils/jsi-utils.cpp
@@ -5,7 +5,7 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-#include "jsi.h"
+#include "jsi-utils.h"
 
 namespace facebook::react {
 
diff --git a/packages/react-native/ReactCommon/react/utils/jsi.h b/packages/react-native/ReactCommon/react/utils/jsi-utils.h
similarity index 100%
rename from packages/react-native/ReactCommon/react/utils/jsi.h
rename to packages/react-native/ReactCommon/react/utils/jsi-utils.h