react-native-windows 0.80.1 → 0.80.5

package/Shared/Shared.vcxitems

@@ -36,7 +36,7 @@
       <DependentUpon>$(ReactNativeWindowsDir)Microsoft.ReactNative\Composition.Input.idl</DependentUpon>
     </ClCompile>
     <ClCompile Include="$(MSBuildThisFileDirectory)..\Microsoft.ReactNative\Fabric\Composition\CompositionAnnotationProvider.cpp">
-	  <ExcludedFromBuild Condition="'$(UseFabric)' != 'true'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(UseFabric)' != 'true'">true</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="$(MSBuildThisFileDirectory)..\Microsoft.ReactNative\Fabric\Composition\CompositionContextHelper.cpp">
       <ExcludedFromBuild Condition="'$(UseFabric)' != 'true'">true</ExcludedFromBuild>
@@ -76,6 +76,10 @@
     <ClCompile Include="$(MSBuildThisFileDirectory)..\Microsoft.ReactNative\Fabric\Composition\CompositionTextRangeProvider.cpp">
       <ExcludedFromBuild Condition="'$(UseFabric)' != 'true'">true</ExcludedFromBuild>
     </ClCompile>
+    <ClCompile Include="$(MSBuildThisFileDirectory)..\Microsoft.ReactNative\Fabric\Composition\DebuggerUIIsland.cpp">
+      <ExcludedFromBuild Condition="'$(UseFabric)' != 'true'">true</ExcludedFromBuild>
+      <SubType>Code</SubType>
+    </ClCompile>
     <ClCompile Include="$(MSBuildThisFileDirectory)..\Microsoft.ReactNative\Fabric\Composition\ReactNativeIsland.cpp">
       <ExcludedFromBuild Condition="'$(UseFabric)' != 'true'">true</ExcludedFromBuild>
       <DependentUpon>$(ReactNativeWindowsDir)Microsoft.ReactNative\ReactNativeIsland.idl</DependentUpon>
@@ -228,16 +232,16 @@
     <ClCompile Include="$(MSBuildThisFileDirectory)..\Microsoft.ReactNative\Fabric\ImageRequestParams.cpp">
       <ExcludedFromBuild Condition="'$(UseFabric)' != 'true'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="$(MSBuildThisFileDirectory)..\Microsoft.ReactNative\SchedulerSettings.cpp"/>
+    <ClCompile Include="$(MSBuildThisFileDirectory)..\Microsoft.ReactNative\SchedulerSettings.cpp" />
     <ClCompile Include="$(MSBuildThisFileDirectory)..\Microsoft.ReactNative\AsynchronousEventBeat.cpp">
       <ExcludedFromBuild Condition="'$(UseFabric)' != 'true'">true</ExcludedFromBuild>
     </ClCompile>
-	<ClCompile Include="$(MSBuildThisFileDirectory)..\Microsoft.ReactNative\ReactNativeWin32App.cpp">
+    <ClCompile Include="$(MSBuildThisFileDirectory)..\Microsoft.ReactNative\ReactNativeWin32App.cpp">
       <ExcludedFromBuild Condition="'$(UseFabric)' != 'true'">true</ExcludedFromBuild>
       <DependentUpon>$(ReactNativeWindowsDir)Microsoft.ReactNative\ReactNativeAppBuilder.idl</DependentUpon>
       <SubType>Code</SubType>
     </ClCompile>
-	<ClCompile Include="$(MSBuildThisFileDirectory)..\Microsoft.ReactNative\ReactNativeAppBuilder.cpp">
+    <ClCompile Include="$(MSBuildThisFileDirectory)..\Microsoft.ReactNative\ReactNativeAppBuilder.cpp">
       <ExcludedFromBuild Condition="'$(UseFabric)' != 'true'">true</ExcludedFromBuild>
       <DependentUpon>$(ReactNativeWindowsDir)Microsoft.ReactNative\ReactNativeAppBuilder.idl</DependentUpon>
       <SubType>Code</SubType>
@@ -251,8 +255,10 @@
     <ClCompile Include="$(MSBuildThisFileDirectory)Executors\WebSocketJSExecutorFactory.cpp" />
     <ClCompile Include="$(MSBuildThisFileDirectory)Hasher.cpp" />
     <ClCompile Include="$(MSBuildThisFileDirectory)HermesRuntimeHolder.cpp" />
-    <ClCompile Include="$(MSBuildThisFileDirectory)HermesSamplingProfiler.cpp" />
-    <ClCompile Include="$(MSBuildThisFileDirectory)InspectorPackagerConnection.cpp" />
+    <ClCompile Include="$(MSBuildThisFileDirectory)Hermes\HermesRuntimeAgentDelegate.cpp" />
+    <ClCompile Include="$(MSBuildThisFileDirectory)Hermes\HermesRuntimeTargetDelegate.cpp" />
+    <ClCompile Include="$(MSBuildThisFileDirectory)Hermes\HermesSamplingProfiler.cpp" />
+    <ClCompile Include="$(MSBuildThisFileDirectory)Inspector\ReactInspectorPackagerConnectionDelegate.cpp" />
     <ClCompile Include="$(MSBuildThisFileDirectory)InstanceManager.cpp" />
     <ClCompile Include="$(MSBuildThisFileDirectory)JSBigAbiString.cpp" />
     <ClCompile Include="$(MSBuildThisFileDirectory)JSI\ChakraApi.cpp" />
@@ -261,7 +267,7 @@
     <ClCompile Include="$(MSBuildThisFileDirectory)JSI\V8RuntimeHolder.cpp">
       <ExcludedFromBuild Condition="'$(UseV8)' != 'true'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="$(MSBuildThisFileDirectory)JSI\JSExecutorFactorySettings.cpp"/>
+    <ClCompile Include="$(MSBuildThisFileDirectory)JSI\JSExecutorFactorySettings.cpp" />
     <ClCompile Include="$(MSBuildThisFileDirectory)LayoutAnimation.cpp" />
     <ClCompile Include="$(MSBuildThisFileDirectory)Logging.cpp" />
     <ClCompile Include="$(MSBuildThisFileDirectory)MemoryMappedBuffer.cpp" />
@@ -342,10 +348,10 @@
     <ClInclude Include="$(MSBuildThisFileDirectory)..\Microsoft.ReactNative\JsiApi.h">
       <DependentUpon>$(MSBuildThisFileDirectory)..\Microsoft.ReactNative\JsiApi.idl</DependentUpon>
     </ClInclude>
-    <ClCompile Include="$(MSBuildThisFileDirectory)..\Microsoft.ReactNative\CallInvoker.cpp"/>
+    <ClCompile Include="$(MSBuildThisFileDirectory)..\Microsoft.ReactNative\CallInvoker.cpp" />
     <ClInclude Include="$(MSBuildThisFileDirectory)..\Microsoft.ReactNative\SchedulerSettings.h" />
-     <ClInclude Include="$(MSBuildThisFileDirectory)..\Microsoft.ReactNative\ReactNativeWin32App.h">
-     <ExcludedFromBuild Condition="'$(UseFabric)' != 'true'">true</ExcludedFromBuild>
+    <ClInclude Include="$(MSBuildThisFileDirectory)..\Microsoft.ReactNative\ReactNativeWin32App.h">
+      <ExcludedFromBuild Condition="'$(UseFabric)' != 'true'">true</ExcludedFromBuild>
       <DependentUpon>$(MSBuildThisFileDirectory)..\Microsoft.ReactNative\ReactNativeAppBuilder.idl</DependentUpon>
       <SubType>Code</SubType>
     </ClInclude>
@@ -408,13 +414,18 @@
     <ClCompile Include="$(MSBuildThisFileDirectory)..\Microsoft.ReactNative\Timer.cpp">
       <DependentUpon>$(MSBuildThisFileDirectory)..\Microsoft.ReactNative\Timer.idl</DependentUpon>
     </ClCompile>
-	
+  </ItemGroup>
+  <ItemGroup>
     <ClInclude Include="$(MSBuildThisFileDirectory)AbiSafe.h" />
     <ClInclude Include="$(MSBuildThisFileDirectory)BaseFileReaderResource.h" />
     <ClInclude Include="$(MSBuildThisFileDirectory)CppRuntimeOptions.h" />
-    <ClInclude Include="$(MSBuildThisFileDirectory)HermesSamplingProfiler.h" />
+    <ClInclude Include="$(MSBuildThisFileDirectory)Hermes\HermesRuntimeAgentDelegate.h" />
+    <ClInclude Include="$(MSBuildThisFileDirectory)Hermes\HermesRuntimeTargetDelegate.h" />
+    <ClInclude Include="$(MSBuildThisFileDirectory)Hermes\HermesSamplingProfiler.h" />
     <ClInclude Include="$(MSBuildThisFileDirectory)IBlobPersistor.h" />
     <ClInclude Include="$(MSBuildThisFileDirectory)IFileReaderResource.h" />
+    <ClInclude Include="$(MSBuildThisFileDirectory)Inspector\ReactInspectorPackagerConnectionDelegate.h" />
+    <ClInclude Include="$(MSBuildThisFileDirectory)Inspector\ReactInspectorThread.h" />
     <ClInclude Include="$(MSBuildThisFileDirectory)JSI\ByteArrayBuffer.h" />
     <ClInclude Include="$(MSBuildThisFileDirectory)JSI\ChakraApi.h" />
     <ClInclude Include="$(MSBuildThisFileDirectory)JSI\ChakraRuntime.h" />
@@ -460,7 +471,6 @@
     <ClInclude Include="$(MSBuildThisFileDirectory)DevSettings.h" />
     <ClInclude Include="$(MSBuildThisFileDirectory)Executors\WebSocketJSExecutor.h" />
     <ClInclude Include="$(MSBuildThisFileDirectory)HermesRuntimeHolder.h" />
-    <ClInclude Include="$(MSBuildThisFileDirectory)InspectorPackagerConnection.h" />
     <ClInclude Include="$(MSBuildThisFileDirectory)IDevSupportManager.h" />
     <ClInclude Include="$(MSBuildThisFileDirectory)InstanceManager.h" />
     <ClInclude Include="$(MSBuildThisFileDirectory)IReactRootView.h" />
@@ -598,8 +608,8 @@
     <ClCompile Include="$(ReactNativeDir)\ReactCommon\react\renderer\components\text\RawTextProps.cpp" />
     <ClCompile Include="$(ReactNativeDir)\ReactCommon\react\renderer\components\text\TextShadowNode.cpp" />
     <ClCompile Include="$(ReactNativeDir)\ReactCommon\react\renderer\components\text\RawTextShadowNode.cpp" />
-    <ClCompile Include="$(ReactNativeDir)\ReactCommon\react\renderer\components\text\ParagraphComponentDescriptor.cpp" DisableSpecificWarnings="5028;%(DisableSpecificWarnings)"/>
-    <ClCompile Include="$(ReactNativeDir)\ReactCommon\react\renderer\components\textinput\TextInputState.cpp" DisableSpecificWarnings="5028;%(DisableSpecificWarnings)"/>
+    <ClCompile Include="$(ReactNativeDir)\ReactCommon\react\renderer\components\text\ParagraphComponentDescriptor.cpp" DisableSpecificWarnings="5028;%(DisableSpecificWarnings)" />
+    <ClCompile Include="$(ReactNativeDir)\ReactCommon\react\renderer\components\textinput\TextInputState.cpp" DisableSpecificWarnings="5028;%(DisableSpecificWarnings)" />
     <ClCompile Include="$(ReactNativeDir)\ReactCommon\react\renderer\components\view\AccessibilityProps.cpp" />
     <ClCompile Include="$(ReactNativeDir)\ReactCommon\react\renderer\components\view\PointerEvent.cpp" />
     <ClCompile Include="$(ReactNativeDir)\ReactCommon\react\renderer\components\view\BaseTouch.cpp" />
@@ -716,7 +726,7 @@
     <Midl Condition="'$(UseFabric)' == 'true' OR '$(IncludeFabricInterface)' == 'true'" Include="$(ReactNativeWindowsDir)Microsoft.ReactNative\Theme.idl" />
     <Midl Condition="'$(UseFabric)' == 'true' OR '$(IncludeFabricInterface)' == 'true'" Include="$(ReactNativeWindowsDir)Microsoft.ReactNative\UriImageManager.idl" />
     <Midl Condition="'$(UseFabric)' == 'true' OR '$(IncludeFabricInterface)' == 'true'" Include="$(ReactNativeWindowsDir)Microsoft.ReactNative\ViewProps.idl" />
-	<Midl Condition="'$(UseFabric)' == 'true' OR '$(IncludeFabricInterface)' == 'true'" Include="$(ReactNativeWindowsDir)Microsoft.ReactNative\ReactNativeAppBuilder.idl" />
+    <Midl Condition="'$(UseFabric)' == 'true' OR '$(IncludeFabricInterface)' == 'true'" Include="$(ReactNativeWindowsDir)Microsoft.ReactNative\ReactNativeAppBuilder.idl" />
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="$(NodeApiJsiDir)src\ApiLoaders\HermesApi.h" />
@@ -732,4 +742,4 @@
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
     </ClCompile>
   </ItemGroup>
-</Project>
+</Project>

package/Shared/Shared.vcxitems.filters

@@ -94,9 +94,6 @@
     <ClCompile Include="$(MSBuildThisFileDirectory)JSI\JSExecutorFactorySettings.cpp">
       <Filter>Source Files\JSI</Filter>
     </ClCompile>
-    <ClCompile Include="$(MSBuildThisFileDirectory)InspectorPackagerConnection.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="$(MSBuildThisFileDirectory)Modules\HttpModule.cpp">
       <Filter>Source Files\Modules</Filter>
     </ClCompile>
@@ -218,6 +215,9 @@
     <ClCompile Include="$(MSBuildThisFileDirectory)..\Microsoft.ReactNative\Fabric\Composition\CompositionAnnotationProvider.cpp">
       <Filter>Source Files\Fabric\Composition</Filter>
     </ClCompile>
+    <ClCompile Include="$(MSBuildThisFileDirectory)..\Microsoft.ReactNative\Fabric\Composition\DebuggerUIIsland.cpp">
+      <Filter>Source Files\Fabric\Composition</Filter>
+    </ClCompile>
     <ClCompile Include="$(MSBuildThisFileDirectory)..\Microsoft.ReactNative\Fabric\Composition\ReactNativeIsland.cpp">
       <Filter>Source Files\Fabric\Composition</Filter>
     </ClCompile>
@@ -230,9 +230,6 @@
     <ClCompile Include="$(MSBuildThisFileDirectory)..\Microsoft.ReactNative\Fabric\Composition\CompositionHwndHost.cpp">
       <Filter>Source Files\Fabric</Filter>
     </ClCompile>
-    <ClCompile Include="$(MSBuildThisFileDirectory)..\Microsoft.ReactNative\Fabric\Composition\ReactNativeIsland.cpp">
-      <Filter>Source Files\Fabric</Filter>
-    </ClCompile>
     <ClCompile Include="$(MSBuildThisFileDirectory)..\Microsoft.ReactNative\Fabric\Composition\CompositionUIService.cpp">
       <Filter>Source Files\Fabric</Filter>
     </ClCompile>
@@ -265,9 +262,6 @@
     <ClCompile Include="$(MSBuildThisFileDirectory)HermesRuntimeHolder.cpp">
       <Filter>Hermes</Filter>
     </ClCompile>
-    <ClCompile Include="$(MSBuildThisFileDirectory)HermesSamplingProfiler.cpp">
-      <Filter>Hermes</Filter>
-    </ClCompile>
     <ClCompile Include="$(NodeApiJsiDir)src\ApiLoaders\HermesApi.cpp" />
     <ClCompile Include="$(MSBuildThisFileDirectory)JSI\V8RuntimeHolder.cpp" />
     <ClCompile Include="$(MSBuildThisFileDirectory)SafeLoadLibrary.cpp" />
@@ -344,6 +338,18 @@
     <ClCompile Include="$(ReactNativeDir)\ReactCommon\oscompat\OSCompatWindows.cpp" />
     <ClCompile Include="$(MSBuildThisFileDirectory)..\Microsoft.ReactNative\Fabric\platform\react\renderer\textlayoutmanager\WindowsTextLayoutManager.cpp" />
     <ClCompile Include="$(ReactNativeDir)\ReactCommon\jsinspector-modern\network\NetworkReporter.cpp" />
+    <ClCompile Include="$(MSBuildThisFileDirectory)Hermes\HermesRuntimeAgentDelegate.cpp">
+      <Filter>Hermes</Filter>
+    </ClCompile>
+    <ClCompile Include="$(MSBuildThisFileDirectory)Hermes\HermesRuntimeTargetDelegate.cpp">
+      <Filter>Hermes</Filter>
+    </ClCompile>
+    <ClCompile Include="$(MSBuildThisFileDirectory)Hermes\HermesSamplingProfiler.cpp">
+      <Filter>Hermes</Filter>
+    </ClCompile>
+    <ClCompile Include="$(MSBuildThisFileDirectory)Inspector\ReactInspectorPackagerConnectionDelegate.cpp">
+      <Filter>Inspector</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <Filter Include="Source Files">
@@ -478,6 +484,9 @@
     <Filter Include="Hermes">
       <UniqueIdentifier>{b32590e6-ae3d-4388-ab98-767345ce38c9}</UniqueIdentifier>
     </Filter>
+    <Filter Include="Inspector">
+      <UniqueIdentifier>{680511e1-15e0-48c9-a2a3-64addaeacce5}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="$(MSBuildThisFileDirectory)Modules\ExceptionsManagerModule.h">
@@ -631,9 +640,6 @@
       <Filter>Header Files\JSI</Filter>
     </ClInclude>
     <ClInclude Include="$(MSBuildThisFileDirectory)..\include\Shared\cdebug.h" />
-    <ClInclude Include="$(MSBuildThisFileDirectory)InspectorPackagerConnection.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="$(MSBuildThisFileDirectory)tracing\tracing.h">
       <Filter>Header Files\tracing</Filter>
     </ClInclude>
@@ -821,9 +827,6 @@
     <ClInclude Include="$(MSBuildThisFileDirectory)HermesRuntimeHolder.h">
       <Filter>Hermes</Filter>
     </ClInclude>
-    <ClInclude Include="$(MSBuildThisFileDirectory)HermesSamplingProfiler.h">
-      <Filter>Hermes</Filter>
-    </ClInclude>
     <ClInclude Include="$(NodeApiJsiDir)src\ApiLoaders\HermesApi.h" />
     <ClInclude Include="$(NodeApiJsiDir)src\ApiLoaders\HermesApi.inc" />
     <ClInclude Include="$(MSBuildThisFileDirectory)..\Microsoft.ReactNative\JsiApi.h" />
@@ -832,6 +835,21 @@
     <ClInclude Include="$(MSBuildThisFileDirectory)V8JSIRuntimeHolder.h" />
     <ClInclude Include="$(MSBuildThisFileDirectory)..\Microsoft.ReactNative\Fabric\Composition\Modal\WindowsModalHostViewSate.h" />
     <ClInclude Include="$(MSBuildThisFileDirectory)..\Microsoft.ReactNative\Fabric\Composition\CompositionViewComponentView.h" />
+    <ClInclude Include="$(MSBuildThisFileDirectory)Hermes\HermesRuntimeAgentDelegate.h">
+      <Filter>Hermes</Filter>
+    </ClInclude>
+    <ClInclude Include="$(MSBuildThisFileDirectory)Hermes\HermesRuntimeTargetDelegate.h">
+      <Filter>Hermes</Filter>
+    </ClInclude>
+    <ClInclude Include="$(MSBuildThisFileDirectory)Hermes\HermesSamplingProfiler.h">
+      <Filter>Hermes</Filter>
+    </ClInclude>
+    <ClInclude Include="$(MSBuildThisFileDirectory)Inspector\ReactInspectorThread.h">
+      <Filter>Inspector</Filter>
+    </ClInclude>
+    <ClInclude Include="$(MSBuildThisFileDirectory)Inspector\ReactInspectorPackagerConnectionDelegate.h">
+      <Filter>Inspector</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="$(MSBuildThisFileDirectory)tracing\rnw.wprp">

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-windows",
-  "version": "0.80.1",
+  "version": "0.80.5",
   "license": "MIT",
   "repository": {
     "type": "git",
@@ -26,7 +26,7 @@
     "@react-native-community/cli": "17.0.0",
     "@react-native-community/cli-platform-android": "17.0.0",
     "@react-native-community/cli-platform-ios": "17.0.0",
-    "@react-native-windows/cli": "0.80.0",
+    "@react-native-windows/cli": "0.80.1",
     "@react-native/assets": "1.0.0",
     "@react-native/assets-registry": "0.80.0",
     "@react-native/codegen": "0.80.0",
@@ -68,7 +68,7 @@
     "yargs": "^17.6.2"
   },
   "devDependencies": {
-    "@react-native-windows/codegen": "0.80.0",
+    "@react-native-windows/codegen": "0.80.1",
     "@react-native/metro-config": "0.80.0",
     "@rnw-scripts/babel-react-native-config": "0.0.0",
     "@rnw-scripts/eslint-config": "1.2.36",
@@ -85,7 +85,7 @@
     "prettier": "2.8.8",
     "react": "19.1.0",
     "react-native": "0.80.0",
-    "react-native-platform-override": "^1.9.56",
+    "react-native-platform-override": "0.80.5",
     "react-refresh": "^0.14.0",
     "typescript": "5.0.4"
   },

package/Microsoft.ReactNative.Cxx/ApiLoaders/JSRuntimeApi.cpp

@@ -1,79 +0,0 @@
-// Copyright (c) Microsoft Corporation.
-// Licensed under the MIT License.
-
-#include "JSRuntimeApi.h"
-
-EXTERN_C_START
-
-// Default JSR function implementations if they are not found in the engine DLL.
-extern napi_status NAPI_CDECL default_jsr_open_napi_env_scope(napi_env env, jsr_napi_env_scope *scope);
-extern napi_status NAPI_CDECL default_jsr_close_napi_env_scope(napi_env env, jsr_napi_env_scope scope);
-extern napi_status NAPI_CDECL default_jsr_get_description(napi_env env, const char **result);
-extern napi_status NAPI_CDECL default_jsr_queue_microtask(napi_env env, napi_value callback);
-extern napi_status NAPI_CDECL default_jsr_drain_microtasks(napi_env env, int32_t max_count_hint, bool *result);
-extern napi_status NAPI_CDECL default_jsr_is_inspectable(napi_env env, bool *result);
-
-extern napi_status NAPI_CDECL default_jsr_create_prepared_script(
-    napi_env env,
-    const uint8_t *script_utf8,
-    size_t script_length,
-    jsr_data_delete_cb script_delete_cb,
-    void *deleter_data,
-    const char *source_url,
-    jsr_prepared_script *result);
-extern napi_status NAPI_CDECL default_jsr_delete_prepared_script(napi_env env, jsr_prepared_script prepared_script);
-extern napi_status NAPI_CDECL
-default_jsr_prepared_script_run(napi_env env, jsr_prepared_script prepared_script, napi_value *result);
-
-EXTERN_C_END
-
-namespace Microsoft::NodeApiJsi {
-
-namespace {
-
-struct JSRuntimeApiNames {
-#define JSR_FUNC(func) static constexpr const char func[] = #func;
-#define JSR_JSI_FUNC JSR_FUNC
-#define JSR_PREPARED_SCRIPT JSR_FUNC
-#include "JSRuntimeApi.inc"
-};
-
-// Prepared script functions either should be all loaded or we use all default functions.
-void loadPreparedScriptFuncs() {
-  JSRuntimeApi *current = JSRuntimeApi::current();
-  bool useDefault = false;
-#define JSR_PREPARED_SCRIPT(func)                                                         \
-  decltype(::func) *loaded_##func =                                                       \
-      reinterpret_cast<decltype(::func) *>(current->getFuncPtr(JSRuntimeApiNames::func)); \
-  useDefault = useDefault || loaded_##func == nullptr;
-#include "JSRuntimeApi.inc"
-#define JSR_PREPARED_SCRIPT(func)                                                             \
-  size_t offset_##func = offsetof(JSRuntimeApi, func);                                        \
-  *reinterpret_cast<decltype(::func) **>(reinterpret_cast<char *>(current) + offset_##func) = \
-      useDefault ? &default_##func : loaded_##func;
-#include "JSRuntimeApi.inc"
-}
-
-} // namespace
-
-thread_local JSRuntimeApi *JSRuntimeApi::current_{};
-
-JSRuntimeApi::JSRuntimeApi(IFuncResolver *funcResolver)
-    : NodeApi(funcResolver)
-#define JSR_FUNC(func)                                                                                                 \
-  ,                                                                                                                    \
-      func(&ApiFuncResolver<JSRuntimeApi, decltype(::func) *, JSRuntimeApiNames::func, offsetof(JSRuntimeApi, func)>:: \
-               stub)
-#define JSR_JSI_FUNC(func)                                                                                             \
-  ,                                                                                                                    \
-      func(&ApiFuncResolver<JSRuntimeApi, decltype(::func) *, JSRuntimeApiNames::func, offsetof(JSRuntimeApi, func)>:: \
-               optionalStub<&default_##func>)
-#define JSR_PREPARED_SCRIPT(func)                                                                                      \
-  ,                                                                                                                    \
-      func(&ApiFuncResolver<JSRuntimeApi, decltype(::func) *, JSRuntimeApiNames::func, offsetof(JSRuntimeApi, func)>:: \
-               preloadStub<&loadPreparedScriptFuncs>)
-#include "JSRuntimeApi.inc"
-{
-}
-
-} // namespace Microsoft::NodeApiJsi

package/Microsoft.ReactNative.Cxx/ApiLoaders/JSRuntimeApi.h

@@ -1,51 +0,0 @@
-// Copyright (c) Microsoft Corporation.
-// Licensed under the MIT License.
-
-#ifndef APILOADERS_JSRUNTIMEAPI_H_
-#define APILOADERS_JSRUNTIMEAPI_H_
-
-#include <js_runtime_api.h>
-#include "NodeApi.h"
-
-namespace Microsoft::NodeApiJsi {
-
-class JSRuntimeApi : public NodeApi {
- public:
-  JSRuntimeApi(IFuncResolver *funcResolver);
-
-  static JSRuntimeApi *current() {
-    return current_;
-  }
-
-  static void setCurrent(JSRuntimeApi *current) {
-    NodeApi::setCurrent(current);
-    current_ = current;
-  }
-
-  class Scope : public NodeApi::Scope {
-   public:
-    Scope(JSRuntimeApi *api) : NodeApi::Scope(api), prevJSRuntimeApi_(JSRuntimeApi::current_) {
-      JSRuntimeApi::current_ = api;
-    }
-
-    ~Scope() {
-      JSRuntimeApi::current_ = prevJSRuntimeApi_;
-    }
-
-   private:
-    JSRuntimeApi *prevJSRuntimeApi_;
-  };
-
- public:
-#define JSR_FUNC(func) decltype(::func) *const func;
-#define JSR_JSI_FUNC JSR_FUNC
-#define JSR_PREPARED_SCRIPT JSR_FUNC
-#include "JSRuntimeApi.inc"
-
- private:
-  static thread_local JSRuntimeApi *current_;
-};
-
-} // namespace Microsoft::NodeApiJsi
-
-#endif // !APILOADERS_JSRUNTIMEAPI_H_

package/Microsoft.ReactNative.Cxx/ApiLoaders/JSRuntimeApi.inc

@@ -1,50 +0,0 @@
-// Copyright (c) Microsoft Corporation.
-// Licensed under the MIT License.
-
-#ifndef JSR_FUNC
-#define JSR_FUNC(func)
-#endif
-
-#ifndef JSR_JSI_FUNC
-#define JSR_JSI_FUNC(func)
-#endif
-
-#ifndef JSR_PREPARED_SCRIPT
-#define JSR_PREPARED_SCRIPT(func)
-#endif
-
-// The JS runtime functions sorted alphabetically.
-JSR_FUNC(jsr_collect_garbage)
-JSR_FUNC(jsr_config_enable_gc_api)
-JSR_FUNC(jsr_config_enable_inspector)
-JSR_FUNC(jsr_config_set_explicit_microtasks)
-JSR_FUNC(jsr_config_set_inspector_break_on_start)
-JSR_FUNC(jsr_config_set_inspector_port)
-JSR_FUNC(jsr_config_set_inspector_runtime_name)
-JSR_FUNC(jsr_config_set_script_cache)
-JSR_FUNC(jsr_config_set_task_runner)
-JSR_FUNC(jsr_create_config)
-JSR_FUNC(jsr_create_runtime)
-JSR_FUNC(jsr_delete_config)
-JSR_FUNC(jsr_delete_runtime)
-JSR_FUNC(jsr_get_and_clear_last_unhandled_promise_rejection)
-JSR_FUNC(jsr_has_unhandled_promise_rejection)
-JSR_FUNC(jsr_run_script)
-JSR_FUNC(jsr_runtime_get_node_api_env)
-
-// The JS runtime functions needed for JSI.
-JSR_JSI_FUNC(jsr_close_napi_env_scope)
-JSR_JSI_FUNC(jsr_queue_microtask)
-JSR_JSI_FUNC(jsr_drain_microtasks)
-JSR_JSI_FUNC(jsr_get_description)
-JSR_JSI_FUNC(jsr_is_inspectable)
-JSR_JSI_FUNC(jsr_open_napi_env_scope)
-
-// The JS runtime functions needed for prepared script.
-JSR_PREPARED_SCRIPT(jsr_create_prepared_script)
-JSR_PREPARED_SCRIPT(jsr_delete_prepared_script)
-JSR_PREPARED_SCRIPT(jsr_prepared_script_run)
-
-#undef JSR_FUNC
-#undef JSR_JSI_FUNC
-#undef JSR_PREPARED_SCRIPT

package/Microsoft.ReactNative.Cxx/ApiLoaders/NodeApi.cpp

@@ -1,41 +0,0 @@
-// Copyright (c) Microsoft Corporation.
-// Licensed under the MIT License.
-
-#include "NodeApi.h"
-
-namespace Microsoft::NodeApiJsi {
-
-namespace {
-
-struct NodeApiNames {
-#define NODE_API_FUNC(func) static constexpr const char func[] = #func;
-#include "NodeApi.inc"
-};
-
-} // namespace
-
-LibFuncResolver::LibFuncResolver(const char *libName) : libHandle_(LibLoader::loadLib(libName)) {}
-
-FuncPtr LibFuncResolver::getFuncPtr(const char *funcName) {
-  return LibLoader::getFuncPtr(libHandle_, funcName);
-}
-
-DelayLoadedApi::DelayLoadedApi(IFuncResolver *funcResolver) : funcResolver_(funcResolver) {}
-
-DelayLoadedApi::~DelayLoadedApi() = default;
-
-FuncPtr DelayLoadedApi::getFuncPtr(const char *funcName) {
-  return funcResolver_->getFuncPtr(funcName);
-}
-
-thread_local NodeApi *NodeApi::current_{};
-
-NodeApi::NodeApi(IFuncResolver *funcResolver)
-    : DelayLoadedApi(funcResolver)
-#define NODE_API_FUNC(func) \
-  , func(&ApiFuncResolver<NodeApi, decltype(::func) *, NodeApiNames::func, offsetof(NodeApi, func)>::stub)
-#include "NodeApi.inc"
-{
-}
-
-} // namespace Microsoft::NodeApiJsi

package/Microsoft.ReactNative.Cxx/ApiLoaders/NodeApi.h

@@ -1,127 +0,0 @@
-// Copyright (c) Microsoft Corporation.
-// Licensed under the MIT License.
-
-#pragma once
-#ifndef APILOADERS_NODEAPI_H_
-#define APILOADERS_NODEAPI_H_
-
-#include <js_native_api.h>
-
-namespace Microsoft::NodeApiJsi {
-
-using LibHandle = struct LibHandle_t *;
-using FuncPtr = struct FuncPtr_t *;
-
-class LibLoader {
- public:
-  static LibHandle loadLib(const char *libName);
-  static FuncPtr getFuncPtr(LibHandle libHandle, const char *funcName);
-};
-
-template <typename TApi, typename T, const char *funcName, size_t offset>
-struct ApiFuncResolver;
-
-template <typename TApi, typename TResult, const char *funcName, size_t offset, typename... TArgs>
-struct ApiFuncResolver<TApi, TResult(NAPI_CDECL *)(TArgs...), funcName, offset> {
-  // Stub is a special function that loads the targeting function on the first call,
-  // replaces function pointer field with the loaded function, and executes the function.
-  // After this all future calls to the loaded function are going to be directly from
-  // the field and not use this Stub.
-  static TResult NAPI_CDECL stub(TArgs... args) {
-    using TFunc = TResult(NAPI_CDECL *)(TArgs...);
-    TApi *current = TApi::current();
-    TFunc func = reinterpret_cast<TFunc>(current->getFuncPtr(funcName));
-    *reinterpret_cast<TFunc *>(reinterpret_cast<char *>(current) + offset) = func;
-    return (*func)(args...);
-  }
-
-  // Optional stub tries to load target function on the first call and set it
-  // as the function pointer. If loading fails, then it uses provided default
-  // function implementation. The default function can either do the required
-  // work or return a failure.
-  template <TResult(NAPI_CDECL *defaultFunc)(TArgs...)>
-  static TResult NAPI_CDECL optionalStub(TArgs... args) {
-    using TFunc = TResult(NAPI_CDECL *)(TArgs...);
-    TApi *current = TApi::current();
-    TFunc func = reinterpret_cast<TFunc>(current->getFuncPtr(funcName));
-    if (func == nullptr) {
-      func = defaultFunc;
-    }
-    *reinterpret_cast<TFunc *>(reinterpret_cast<char *>(current) + offset) = func;
-    return (*func)(args...);
-  }
-
-  template <void (*preloadFunc)()>
-  static TResult NAPI_CDECL preloadStub(TArgs... args) {
-    using TFunc = TResult(NAPI_CDECL *)(TArgs...);
-    preloadFunc();
-    TApi *current = TApi::current();
-    TFunc func = *reinterpret_cast<TFunc *>(reinterpret_cast<char *>(current) + offset);
-    return (*func)(args...);
-  }
-};
-
-struct IFuncResolver {
-  virtual FuncPtr getFuncPtr(const char *funcName) = 0;
-};
-
-class LibFuncResolver : public IFuncResolver {
- public:
-  LibFuncResolver(const char *libName);
-  FuncPtr getFuncPtr(const char *funcName) override;
-
- private:
-  LibHandle libHandle_;
-};
-
-class DelayLoadedApi {
- public:
-  DelayLoadedApi(IFuncResolver *funcResolver);
-  ~DelayLoadedApi();
-
-  FuncPtr getFuncPtr(const char *funcName);
-
-  DelayLoadedApi(const DelayLoadedApi &) = delete;
-  DelayLoadedApi &operator=(const DelayLoadedApi &) = delete;
-
- private:
-  IFuncResolver *funcResolver_;
-};
-
-class NodeApi : public DelayLoadedApi {
- public:
-  NodeApi(IFuncResolver *funcResolver);
-
-  static NodeApi *current() {
-    return current_;
-  }
-
-  static void setCurrent(NodeApi *current) {
-    current_ = current;
-  }
-
-  class Scope {
-   public:
-    Scope(NodeApi *nodeApi) : prevNodeApi_(NodeApi::current_) {
-      NodeApi::current_ = nodeApi;
-    }
-
-    ~Scope() {
-      NodeApi::current_ = prevNodeApi_;
-    }
-
-   private:
-    NodeApi *prevNodeApi_;
-  };
-
- public:
-#define NODE_API_FUNC(func) decltype(::func) *const func;
-#include "NodeApi.inc"
-
- private:
-  static thread_local NodeApi *current_;
-};
-
-} // namespace Microsoft::NodeApiJsi
-
-#endif // !APILOADERS_NODEAPI_H_