Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "prerelease",
"comment": "Bump Hermes package version",
"packageName": "react-native-windows",
"email": "tudor.mihai@microsoft.com",
"dependentChangeType": "patch"
}
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@
<Version>1.0.9</Version>
</PackageReference>
<PackageReference Include="ReactNative.Hermes.Windows">
<Version>0.11.0-ms.6</Version>
<Version>0.12.1</Version>
</PackageReference>
</ItemGroup>
<ImportGroup Label="ReactNativeWindowsTargets">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,7 @@
<!-- <PackageReference Include="Microsoft.UI.Xaml" Version="2.6.1-prerelease.210709001" /> -->
<PackageReference Include="Microsoft.Windows.CppWinRT" Version="$(CppWinRTVersion)" />
<PackageReference Include="Microsoft.VCRTForwarders.140" Version="1.0.2-rc" />
<PackageReference Include="ReactNative.Hermes.Windows" Version="0.11.0-ms.6" />
<PackageReference Include="ReactNative.Hermes.Windows" Version="0.12.1" />
<PackageReference Include="$(V8PackageName)" Version="$(V8Version)" Condition="'$(UseV8)' == 'true'" />
</ItemGroup>
<Target Name="EnsureReactNativeWindowsTargets" BeforeTargets="PrepareForBuild">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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="ReactNative.Hermes.Windows" version="0.11.0-ms.6" targetFramework="native"/>
<package id="ReactNative.Hermes.Windows" version="0.12.1" targetFramework="native"/>
</packages>
2 changes: 1 addition & 1 deletion packages/playground/windows/playground/packages.config
Original file line number Diff line number Diff line change
Expand Up @@ -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="ReactNative.Hermes.Windows" version="0.11.0-ms.6" targetFramework="native"/>
<package id="ReactNative.Hermes.Windows" version="0.12.1" targetFramework="native"/>
</packages>
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@
<Version>6.2.9</Version>
</PackageReference>
<PackageReference Include="ReactNative.Hermes.Windows">
<Version>0.11.0-ms.6</Version>
<Version>0.12.1</Version>
</PackageReference>
</ItemGroup>
<ImportGroup Label="ReactNativeWindowsTargets">
Expand Down
2 changes: 1 addition & 1 deletion vnext/PropertySheets/JSEngine.props
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<!-- Enabling this will (1) Include hermes glues in the Microsoft.ReactNative binaries AND (2) Make hermes the default engine -->
<UseHermes Condition="'$(UseHermes)' == ''">false</UseHermes>
<!-- This will be true if (1) the client want to use hermes by setting UseHermes to true OR (2) We are building for UWP where dynamic switching is enabled -->
<HermesVersion Condition="'$(HermesVersion)' == ''">0.11.0-ms.6</HermesVersion>
<HermesVersion Condition="'$(HermesVersion)' == ''">0.12.1</HermesVersion>
<HermesPackage Condition="'$(HermesPackage)' == '' And Exists('$(PkgReactNative_Hermes_Windows)')">$(PkgReactNative_Hermes_Windows)</HermesPackage>
<HermesPackage Condition="'$(HermesPackage)' == ''">$(NuGetPackageRoot)\ReactNative.Hermes.Windows\$(HermesVersion)</HermesPackage>
<EnableHermesInspectorInReleaseFlavor Condition="'$(EnableHermesInspectorInReleaseFlavor)' == ''">false</EnableHermesInspectorInReleaseFlavor>
Expand Down
4 changes: 2 additions & 2 deletions vnext/Shared/InspectorPackagerConnection.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -86,8 +86,8 @@ struct InspectorProtocol {
for (const facebook::react::InspectorPage2 &page : pages) {
folly::dynamic pageDyn = folly::dynamic::object;
pageDyn["id"] = page.id;
pageDyn["title"] = std::string(page.title);
pageDyn["vm"] = std::string(page.vm);
pageDyn["title"] = page.title;
pageDyn["vm"] = page.vm;

pageDyn["isLastBundleDownloadSuccess"] = bundleStatus.m_isLastDownloadSucess;
pageDyn["bundleUpdateTimestamp"] = bundleStatus.m_updateTimestamp;
Expand Down
4,279 changes: 1,993 additions & 2,286 deletions yarn.lock

Large diffs are not rendered by default.