Skip to content

Commit 128d9f0

Browse files
authored
[0.71] Revert "Update V8 JSI version to 0.71.8 (#12043)" (#12142)
* Revert "[0.71] Update V8 JSI version to 0.71.8 (#12043)" This reverts commit dcb75bb. * Revert "[0.71] ABI-safe Hermes API and new JSI for Node-API (#11696) (#12033)" This reverts commit fbed06a. * Change files
1 parent 0b57e95 commit 128d9f0

File tree

54 files changed

+3125
-1252
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

54 files changed

+3125
-1252
lines changed
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"type": "patch",
3+
"comment": "Revert \"[0.71] ABI-safe Hermes API and new JSI for Node-API (#11696) (#12033)\"",
4+
"packageName": "@react-native-windows/telemetry",
5+
"email": "[email protected]",
6+
"dependentChangeType": "patch"
7+
}
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"type": "patch",
3+
"comment": "Revert \"[0.71] Update V8 JSI version to 0.71.8 (#12043)\"",
4+
"packageName": "react-native-windows",
5+
"email": "[email protected]",
6+
"dependentChangeType": "patch"
7+
}

packages/@react-native-windows/telemetry/src/test/projects/UsesPackagesConfig/packages.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@
22
<packages>
33
<package id="Microsoft.Windows.CppWinRT" version="2.0.210312.4" targetFramework="native"/>
44
<package id="Microsoft.UI.Xaml" version="2.6.0" targetFramework="native"/>
5-
<package id="Microsoft.JavaScript.Hermes" version="0.1.15" targetFramework="native"/>
5+
<package id="ReactNative.Hermes.Windows" version="0.71.1" targetFramework="native"/>
66
</packages>

packages/e2e-test-app/windows/RNTesterApp/packages.lock.json

Lines changed: 6 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,6 @@
22
"version": 1,
33
"dependencies": {
44
"UAP,Version=v10.0.16299": {
5-
"Microsoft.JavaScript.Hermes": {
6-
"type": "Direct",
7-
"requested": "[0.1.15, )",
8-
"resolved": "0.1.15",
9-
"contentHash": "My/u5RvxoymtwWokoweU6iVpuP79w271UjadcmSNqnQ9ESIv00tlVP4sHnIiN3t2lJNDeciyE1EVF4swGPECKQ=="
10-
},
115
"Microsoft.NETCore.UniversalWindowsPlatform": {
126
"type": "Direct",
137
"requested": "[6.2.9, )",
@@ -37,11 +31,6 @@
3731
"resolved": "1.76.0",
3832
"contentHash": "p+w3YvNdXL8Cu9Fzrmexssu0tZbWxuf6ywsQqHjDlKFE5ojXHof1HIyMC3zDLfLnh80dIeFcEUAuR2Asg/XHRA=="
3933
},
40-
"CDebug": {
41-
"type": "Transitive",
42-
"resolved": "0.0.3",
43-
"contentHash": "C6pojNJ2rdJuOdhe0xhJ/FedNLRJkpCVLEEHsfgoU5d5kkOOVKK+7xlGWYgttB51nDB5dLDu/O8j03jSxu81oA=="
44-
},
4534
"Microsoft.Net.Native.Compiler": {
4635
"type": "Transitive",
4736
"resolved": "2.2.7-rel-27913-00",
@@ -81,6 +70,11 @@
8170
"Microsoft.NETCore.Platforms": "1.1.0"
8271
}
8372
},
73+
"ReactNative.Hermes.Windows": {
74+
"type": "Transitive",
75+
"resolved": "0.71.1",
76+
"contentHash": "b6GLQSLaffgxAXwoTrxfj73W5cxlPxmNlQoVmyAnucXPCwV7HiL0rZsqGpBf+r2rdubUS35patY/c+8RiBR4+Q=="
77+
},
8478
"runtime.win10-arm.Microsoft.Net.Native.Compiler": {
8579
"type": "Transitive",
8680
"resolved": "2.2.7-rel-27913-00",
@@ -173,10 +167,10 @@
173167
"dependencies": {
174168
"Common": "[1.0.0, )",
175169
"Folly": "[1.0.0, )",
176-
"Microsoft.JavaScript.Hermes": "[0.1.15, )",
177170
"Microsoft.UI.Xaml": "[2.7.0, )",
178171
"Microsoft.Windows.SDK.BuildTools": "[10.0.22000.194, )",
179172
"ReactCommon": "[1.0.0, )",
173+
"ReactNative.Hermes.Windows": "[0.71.1, )",
180174
"boost": "[1.76.0, )"
181175
}
182176
},
@@ -204,7 +198,6 @@
204198
"reactnativexaml": {
205199
"type": "Project",
206200
"dependencies": {
207-
"CDebug": "[0.0.3, )",
208201
"Microsoft.ReactNative": "[1.0.0, )",
209202
"Microsoft.UI.Xaml": "[2.7.0, )"
210203
}

packages/playground/windows/playground-composition/packages.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,5 @@
99
<package id="Microsoft.UI.Xaml" version="2.7.0-prerelease.210913003" targetFramework="native"/>
1010
<package id="Microsoft.VCRTForwarders.140" version="1.0.2-rc" targetFramework="native"/>
1111
<package id="Microsoft.Windows.CppWinRT" version="2.0.210312.4" targetFramework="native"/>
12-
<package id="Microsoft.JavaScript.Hermes" version="0.1.15" targetFramework="native"/>
12+
<package id="ReactNative.Hermes.Windows" version="0.71.1" targetFramework="native"/>
1313
</packages>

packages/playground/windows/playground-win32/packages.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,5 @@
99
<package id="Microsoft.UI.Xaml" version="2.7.0-prerelease.210913003" targetFramework="native"/>
1010
<package id="Microsoft.VCRTForwarders.140" version="1.0.2-rc" targetFramework="native"/>
1111
<package id="Microsoft.Windows.CppWinRT" version="2.0.210312.4" targetFramework="native"/>
12-
<package id="Microsoft.JavaScript.Hermes" version="0.1.15" targetFramework="native"/>
12+
<package id="ReactNative.Hermes.Windows" version="0.71.1" targetFramework="native"/>
1313
</packages>

packages/playground/windows/playground/packages.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,5 @@
33
<package id="Microsoft.Windows.CppWinRT" version="2.0.210312.4" targetFramework="native"/>
44
<package id="Microsoft.UI.Xaml" version="2.7.0" targetFramework="native"/>
55
<package id="Microsoft.WinUI" version="3.0.0-preview4.210210.4" targetFramework="native"/>
6-
<package id="Microsoft.JavaScript.Hermes" version="0.1.15" targetFramework="native"/>
6+
<package id="ReactNative.Hermes.Windows" version="0.71.1" targetFramework="native"/>
77
</packages>

vnext/Desktop.DLL/React.Windows.Desktop.DLL.vcxproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@
153153
</ItemGroup>
154154
<ItemGroup>
155155
<PackageReference Include="boost" Version="1.76.0.0" />
156-
<PackageReference Include="Microsoft.JavaScript.Hermes" Version="$(HermesVersion)" />
156+
<PackageReference Include="ReactNative.Hermes.Windows" Version="$(HermesVersion)" />
157157
<PackageReference Include="ReactWindows.OpenSSL.StdCall.Static" Version="1.0.2-p.5" />
158158
</ItemGroup>
159159
<Choose>

vnext/Desktop/React.Windows.Desktop.vcxproj

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -304,6 +304,9 @@
304304
<DependentUpon>..\Microsoft.ReactNative\IReactPropertyBag.idl</DependentUpon>
305305
<SubType>Code</SubType>
306306
</ClInclude>
307+
<ClInclude Include="..\Microsoft.ReactNative\JsiApi.h">
308+
<DependentUpon>..\Microsoft.ReactNative\JsiApi.idl</DependentUpon>
309+
</ClInclude>
307310
<ClInclude Include="..\Microsoft.ReactNative\RedBoxErrorFrameInfo.h" />
308311
<ClInclude Include="..\Microsoft.ReactNative\RedBoxErrorInfo.h" />
309312
<ClInclude Include="JSBigStringResourceDll.h" />
@@ -327,7 +330,7 @@
327330
<ItemGroup>
328331
<PackageReference Include="boost" Version="1.76.0.0" />
329332
<PackageReference Include="Microsoft.Windows.CppWinRT" Version="$(CppWinRTVersion)" PrivateAssets="all" />
330-
<PackageReference Include="Microsoft.JavaScript.Hermes" Version="$(HermesVersion)" />
333+
<PackageReference Include="ReactNative.Hermes.Windows" Version="$(HermesVersion)" />
331334
<PackageReference Include="ReactWindows.OpenSSL.StdCall.Static" Version="1.0.2-p.5" />
332335
</ItemGroup>
333336
<Choose>

vnext/Directory.Build.props

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,6 @@
2121
<!-- 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. -->
2222
<FmtVersion>8.0.0</FmtVersion>
2323
<FmtCommitHash>9e8b86fd2d9806672cc73133d21780dd182bfd24</FmtCommitHash>
24-
<!-- Commit hash for https://github.com/microsoft/node-api-jsi code. -->
25-
<NodeApiJsiCommitHash>53b897b03c1c7e57c3372acc6234447a44e150d6</NodeApiJsiCommitHash>
2624
</PropertyGroup>
2725

2826
<!--
@@ -42,9 +40,6 @@
4240

4341
<FmtDir Condition="'$(FmtDir)' == '' AND Exists('$([MSBuild]::NormalizeDirectory($(ReactNativeDir)..\..\node_modules))')">$(ReactNativeDir)..\..\node_modules\.fmt\fmt-$(FmtVersion)</FmtDir>
4442
<FmtDir>$([MSBuild]::NormalizeDirectory($(FmtDir)))</FmtDir>
45-
46-
<NodeApiJsiDir Condition="'$(NodeApiJsiDir)' == '' AND Exists('$([MSBuild]::NormalizeDirectory($(ReactNativeDir)..\..\node_modules))')">$(ReactNativeDir)..\..\node_modules\.node-api-jsi\node-api-jsi-$(NodeApiJsiCommitHash)</NodeApiJsiDir>
47-
<NodeApiJsiDir>$([MSBuild]::NormalizeDirectory($(NodeApiJsiDir)))</NodeApiJsiDir>
4843
</PropertyGroup>
4944

5045
<PropertyGroup Label="Configuration">

0 commit comments

Comments
 (0)