[0.71] Revert PR #11757 that added use of hermes.dll with C API (#11788)

* Revert "[0.71] ABI-safe Hermes API and new JSI for Node-API (#11696) (#11757)" This reverts commit 7a340bd. * Change files
microsoft · Jun 20, 2023 · 569d940 · 569d940
1 parent f63a725
commit 569d940
Show file tree

Hide file tree

Showing 57 changed files with 3,194 additions and 1,244 deletions.
diff --git a/change/@react-native-windows-telemetry-350a0caf-2b27-4e0e-81b2-c4a2663ac6e9.json b/change/@react-native-windows-telemetry-350a0caf-2b27-4e0e-81b2-c4a2663ac6e9.json
@@ -0,0 +1,7 @@
+{
+  "type": "patch",
+  "comment": "Revert \"[0.71] ABI-safe Hermes API and new JSI for Node-API (#11696) (#11757)\"",
+  "packageName": "@react-native-windows/telemetry",
+  "email": "vmorozov@microsoft.com",
+  "dependentChangeType": "patch"
+}
diff --git a/change/react-native-windows-ac9787c9-6df0-422c-bd56-394ed42578cb.json b/change/react-native-windows-ac9787c9-6df0-422c-bd56-394ed42578cb.json
@@ -0,0 +1,7 @@
+{
+  "type": "patch",
+  "comment": "Revert \"[0.71] ABI-safe Hermes API and new JSI for Node-API (#11696) (#11757)\"",
+  "packageName": "react-native-windows",
+  "email": "vmorozov@microsoft.com",
+  "dependentChangeType": "patch"
+}
diff --git a/...ages/@react-native-windows/telemetry/src/test/projects/UsesPackagesConfig/packages.config b/...ages/@react-native-windows/telemetry/src/test/projects/UsesPackagesConfig/packages.config
@@ -2,5 +2,5 @@
 <packages>
   <package id="Microsoft.Windows.CppWinRT" version="2.0.210312.4" targetFramework="native"/>
   <package id="Microsoft.UI.Xaml" version="2.6.0" targetFramework="native"/>
-  <package id="Microsoft.JavaScript.Hermes" version="0.1.15" targetFramework="native"/>
+  <package id="ReactNative.Hermes.Windows" version="0.71.1" targetFramework="native"/>
 </packages>
diff --git a/packages/e2e-test-app/windows/RNTesterApp/packages.lock.json b/packages/e2e-test-app/windows/RNTesterApp/packages.lock.json
@@ -2,12 +2,6 @@
   "version": 1,
   "dependencies": {
     "UAP,Version=v10.0.16299": {
-      "Microsoft.JavaScript.Hermes": {
-        "type": "Direct",
-        "requested": "[0.1.15, )",
-        "resolved": "0.1.15",
-        "contentHash": "My/u5RvxoymtwWokoweU6iVpuP79w271UjadcmSNqnQ9ESIv00tlVP4sHnIiN3t2lJNDeciyE1EVF4swGPECKQ=="
-      },
       "Microsoft.NETCore.UniversalWindowsPlatform": {
         "type": "Direct",
         "requested": "[6.2.9, )",
@@ -37,11 +31,6 @@
         "resolved": "1.76.0",
         "contentHash": "p+w3YvNdXL8Cu9Fzrmexssu0tZbWxuf6ywsQqHjDlKFE5ojXHof1HIyMC3zDLfLnh80dIeFcEUAuR2Asg/XHRA=="
       },
-      "CDebug": {
-        "type": "Transitive",
-        "resolved": "0.0.3",
-        "contentHash": "C6pojNJ2rdJuOdhe0xhJ/FedNLRJkpCVLEEHsfgoU5d5kkOOVKK+7xlGWYgttB51nDB5dLDu/O8j03jSxu81oA=="
-      },
       "Microsoft.Net.Native.Compiler": {
         "type": "Transitive",
         "resolved": "2.2.7-rel-27913-00",
@@ -81,6 +70,11 @@
           "Microsoft.NETCore.Platforms": "1.1.0"
         }
       },
+      "ReactNative.Hermes.Windows": {
+        "type": "Transitive",
+        "resolved": "0.71.1",
+        "contentHash": "b6GLQSLaffgxAXwoTrxfj73W5cxlPxmNlQoVmyAnucXPCwV7HiL0rZsqGpBf+r2rdubUS35patY/c+8RiBR4+Q=="
+      },
       "runtime.win10-arm.Microsoft.Net.Native.Compiler": {
         "type": "Transitive",
         "resolved": "2.2.7-rel-27913-00",
@@ -173,10 +167,10 @@
         "dependencies": {
           "Common": "[1.0.0, )",
           "Folly": "[1.0.0, )",
-          "Microsoft.JavaScript.Hermes": "[0.1.15, )",
           "Microsoft.UI.Xaml": "[2.7.0, )",
           "Microsoft.Windows.SDK.BuildTools": "[10.0.22000.194, )",
           "ReactCommon": "[1.0.0, )",
+          "ReactNative.Hermes.Windows": "[0.71.1, )",
           "boost": "[1.76.0, )"
         }
       },
@@ -204,7 +198,6 @@
       "reactnativexaml": {
         "type": "Project",
         "dependencies": {
-          "CDebug": "[0.0.3, )",
           "Microsoft.ReactNative": "[1.0.0, )",
           "Microsoft.UI.Xaml": "[2.7.0, )"
         }

diff --git a/packages/playground/windows/playground-composition/packages.config b/packages/playground/windows/playground-composition/packages.config
@@ -9,5 +9,5 @@
   <package id="Microsoft.UI.Xaml" version="2.7.0-prerelease.210913003" targetFramework="native"/>
   <package id="Microsoft.VCRTForwarders.140" version="1.0.2-rc" targetFramework="native"/>
   <package id="Microsoft.Windows.CppWinRT" version="2.0.210312.4" targetFramework="native"/>
-  <package id="Microsoft.JavaScript.Hermes" version="0.1.15" targetFramework="native"/>
+  <package id="ReactNative.Hermes.Windows" version="0.71.1" targetFramework="native"/>
 </packages>
diff --git a/packages/playground/windows/playground-win32/packages.config b/packages/playground/windows/playground-win32/packages.config
@@ -9,5 +9,5 @@
   <package id="Microsoft.UI.Xaml" version="2.7.0-prerelease.210913003" targetFramework="native"/>
   <package id="Microsoft.VCRTForwarders.140" version="1.0.2-rc" targetFramework="native"/>
   <package id="Microsoft.Windows.CppWinRT" version="2.0.210312.4" targetFramework="native"/>
-  <package id="Microsoft.JavaScript.Hermes" version="0.1.15" targetFramework="native"/>
+  <package id="ReactNative.Hermes.Windows" version="0.71.1" targetFramework="native"/>
 </packages>
diff --git a/packages/playground/windows/playground/packages.config b/packages/playground/windows/playground/packages.config
@@ -3,5 +3,5 @@
   <package id="Microsoft.Windows.CppWinRT" version="2.0.210312.4" targetFramework="native"/>
   <package id="Microsoft.UI.Xaml" version="2.7.0" targetFramework="native"/>
   <package id="Microsoft.WinUI" version="3.0.0-preview4.210210.4" targetFramework="native"/>
-  <package id="Microsoft.JavaScript.Hermes" version="0.1.15" targetFramework="native"/>
+  <package id="ReactNative.Hermes.Windows" version="0.71.1" targetFramework="native"/>
 </packages>
diff --git a/vnext/Desktop.DLL/React.Windows.Desktop.DLL.vcxproj b/vnext/Desktop.DLL/React.Windows.Desktop.DLL.vcxproj
@@ -153,7 +153,7 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="boost" Version="1.76.0.0" />
-    <PackageReference Include="Microsoft.JavaScript.Hermes" Version="$(HermesVersion)" />
+    <PackageReference Include="ReactNative.Hermes.Windows" Version="$(HermesVersion)" />
     <PackageReference Include="ReactWindows.OpenSSL.StdCall.Static" Version="1.0.2-p.5" />
   </ItemGroup>
   <Choose>

diff --git a/vnext/Desktop/React.Windows.Desktop.vcxproj b/vnext/Desktop/React.Windows.Desktop.vcxproj
@@ -307,6 +307,9 @@
       <DependentUpon>..\Microsoft.ReactNative\IReactPropertyBag.idl</DependentUpon>
       <SubType>Code</SubType>
     </ClInclude>
+    <ClInclude Include="..\Microsoft.ReactNative\JsiApi.h">
+      <DependentUpon>..\Microsoft.ReactNative\JsiApi.idl</DependentUpon>
+    </ClInclude>
     <ClInclude Include="..\Microsoft.ReactNative\RedBoxErrorFrameInfo.h" />
     <ClInclude Include="..\Microsoft.ReactNative\RedBoxErrorInfo.h" />
     <ClInclude Include="JSBigStringResourceDll.h" />
@@ -331,7 +334,7 @@
   <ItemGroup>
     <PackageReference Include="boost" Version="1.76.0.0" />
     <PackageReference Include="Microsoft.Windows.CppWinRT" Version="$(CppWinRTVersion)" PrivateAssets="all" />
-    <PackageReference Include="Microsoft.JavaScript.Hermes" Version="$(HermesVersion)" />
+    <PackageReference Include="ReactNative.Hermes.Windows" Version="$(HermesVersion)" />
     <PackageReference Include="ReactWindows.OpenSSL.StdCall.Static" Version="1.0.2-p.5" />
   </ItemGroup>
   <Choose>

diff --git a/vnext/Directory.Build.props b/vnext/Directory.Build.props
@@ -21,8 +21,6 @@
     <!-- When bumping the fmt version, be sure to bump the git hash of that version's commit and build fmt.vcxproj (to update its cgmanifest.json) too. -->
     <FmtVersion>8.0.0</FmtVersion>
     <FmtCommitHash>9e8b86fd2d9806672cc73133d21780dd182bfd24</FmtCommitHash>
-    <!-- Commit hash for https://github.com/microsoft/node-api-jsi code. -->
-    <NodeApiJsiCommitHash>53b897b03c1c7e57c3372acc6234447a44e150d6</NodeApiJsiCommitHash>
   </PropertyGroup>
 
   <!--
@@ -42,9 +40,6 @@
 
     <FmtDir Condition="'$(FmtDir)' == '' AND Exists('$([MSBuild]::NormalizeDirectory($(ReactNativeDir)..\..\node_modules))')">$(ReactNativeDir)..\..\node_modules\.fmt\fmt-$(FmtVersion)</FmtDir>
     <FmtDir>$([MSBuild]::NormalizeDirectory($(FmtDir)))</FmtDir>
-
-    <NodeApiJsiDir Condition="'$(NodeApiJsiDir)' == '' AND Exists('$([MSBuild]::NormalizeDirectory($(ReactNativeDir)..\..\node_modules))')">$(ReactNativeDir)..\..\node_modules\.node-api-jsi\node-api-jsi-$(NodeApiJsiCommitHash)</NodeApiJsiDir>
-    <NodeApiJsiDir>$([MSBuild]::NormalizeDirectory($(NodeApiJsiDir)))</NodeApiJsiDir>
   </PropertyGroup>
 
   <PropertyGroup Label="Configuration">

diff --git a/vnext/Microsoft.ReactNative.Cxx/JSI/NodeApiJsiLoader.cpp b/vnext/Microsoft.ReactNative.Cxx/JSI/NodeApiJsiLoader.cpp