Skip to content

Commit c90a4a6

Browse files
Taritsyndustinsoftware
authored andcommitted
Replace internal implementation of the VroomJsEngine by the JavaScriptEngineSwitcher.Vroom module (#533)
1 parent cb086eb commit c90a4a6

File tree

3 files changed

+6
-300
lines changed

3 files changed

+6
-300
lines changed

src/React.Core/JavaScriptEngineFactory.cs

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
using System;
1+
using System;
22
using System.Collections.Concurrent;
33
using System.Diagnostics;
44
using System.Linq;
@@ -11,6 +11,7 @@
1111
#else
1212
using JavaScriptEngineSwitcher.ChakraCore;
1313
#endif
14+
using JavaScriptEngineSwitcher.Vroom;
1415
using JSPool;
1516
using React.Exceptions;
1617

@@ -379,7 +380,7 @@ private static void EnsureJsEnginesRegistered(JsEngineSwitcher jsEngineSwitcher,
379380
#if NET40
380381
jsEngineSwitcher.EngineFactories.AddV8();
381382
#endif
382-
jsEngineSwitcher.EngineFactories.Add(new VroomJsEngine.Factory());
383+
jsEngineSwitcher.EngineFactories.AddVroom();
383384
if (allowMsie)
384385
{
385386
jsEngineSwitcher.EngineFactories.AddMsie();

src/React.Core/React.Core.csproj

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
1+
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
44
<Description>ReactJS and Babel tools for .NET. Important: This package does not do much on its own; you probably want an integration package (like React.Web.Mvc4) as well. Please refer to project site (http://reactjs.net/) for more details, usage examples and sample code.</Description>
@@ -35,22 +35,22 @@
3535
<PackageReference Include="JavaScriptEngineSwitcher.ChakraCore" Version="2.4.8" />
3636
<PackageReference Include="JavaScriptEngineSwitcher.Core" Version="2.4.9" />
3737
<PackageReference Include="JavaScriptEngineSwitcher.Msie" Version="2.4.9" />
38+
<PackageReference Include="JavaScriptEngineSwitcher.Vroom" Version="2.4.0" />
3839
<PackageReference Include="JSPool" Version="3.0.1" />
3940
<PackageReference Include="MsieJavaScriptEngine" Version="2.2.2" />
4041
<PackageReference Include="Newtonsoft.Json" Version="9.0.1" />
42+
<PackageReference Include="VroomJs" Version="1.2.3" />
4143
</ItemGroup>
4244

4345
<ItemGroup Condition=" '$(TargetFramework)' == 'net40' ">
4446
<PackageReference Include="JavaScriptEngineSwitcher.V8" Version="2.4.2" />
45-
<PackageReference Include="VroomJs" Version="1.2.3" />
4647
<Reference Include="System.Runtime.Caching" />
4748
<Reference Include="System" />
4849
<Reference Include="Microsoft.CSharp" />
4950
</ItemGroup>
5051

5152
<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.6' ">
5253
<PackageReference Include="Microsoft.Extensions.DependencyModel" Version="1.1.1" />
53-
<PackageReference Include="VroomJs" Version="1.2.3" />
5454
</ItemGroup>
5555

5656
</Project>

src/React.Core/VroomJsEngine.cs

-295
This file was deleted.

0 commit comments

Comments
 (0)