Move UseReactWithEnvironment to separate namespace

Author: dustinsoftware

src/React.AspNet.Middleware/ReactBuilderExtensions.cs

@@ -9,7 +9,6 @@
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Http;
-using React.Exceptions;
 using React.TinyIoC;
 using Microsoft.Extensions.DependencyInjection;
 using Newtonsoft.Json.Serialization;
@@ -27,21 +26,19 @@ namespace React.AspNet
 	/// <summary>
 	/// Handles registering ReactJS.NET middleware in an ASP.NET <see cref="IApplicationBuilder"/>.
 	/// </summary>
-    public static class ReactBuilderExtensions
-    {
+	public static class ReactBuilderExtensions
+	{
 		/// <summary>
 		/// Initialises ReactJS.NET for this application
 		/// </summary>
 		/// <param name="app">ASP.NET application builder</param>
 		/// <param name="configure">ReactJS.NET configuration</param>
 		/// <param name="fileOptions">Options to use for serving files</param>
-		/// <param name="useNodeEnvironment"></param>
 		/// <returns>The application builder (for chaining)</returns>
 		public static IApplicationBuilder UseReact(
 			this IApplicationBuilder app,
 			Action<IReactSiteConfiguration> configure,
-			BabelFileOptions fileOptions = null,
-			bool useNodeEnvironment = false
+			BabelFileOptions fileOptions = null
 		)
 		{
 			RegisterAspNetServices(React.AssemblyRegistration.Container, app.ApplicationServices);
@@ -57,12 +54,6 @@ public static IApplicationBuilder UseReact(
 
 			configure(ReactSiteConfiguration.Configuration);
 
-			if (useNodeEnvironment)
-			{
-				TinyIoCContainer.Current.Unregister<IReactEnvironment>();
-				TinyIoCContainer.Current.Register<IReactEnvironment, ReactWithNodeEnvironment>();
-			}
-
 			// Allow serving of .jsx files
 			app.UseMiddleware<BabelFileMiddleware>(fileOptions ?? new BabelFileOptions());
 

src/React.NodeServices/React.NodeServices.csproj

@@ -9,6 +9,7 @@
   </ItemGroup>
 
   <ItemGroup>
+    <ProjectReference Include="..\React.AspNet.Middleware\React.AspNet.Middleware.csproj" />
     <ProjectReference Include="..\React.Core\React.Core.csproj" />
   </ItemGroup>
 </Project>

src/React.NodeServices/ReactNodeEnvironmentExtensions.cs

@@ -0,0 +1,31 @@
+using System;
+using Microsoft.AspNetCore.Builder;
+using React.AspNet;
+using React.TinyIoC;
+
+namespace React.NodeServices
+{
+	public static class ReactNodeEnvironmentExtensions
+	{
+		/// <summary>
+		/// 
+		/// </summary>
+		/// <typeparam name="T"></typeparam>
+		/// <param name="app"></param>
+		/// <param name="configure"></param>
+		/// <param name="fileOptions"></param>
+		/// <returns></returns>
+		public static IApplicationBuilder UseReactWithEnvironment<T>(
+			this IApplicationBuilder app,
+			Action<IReactSiteConfiguration> configure,
+			BabelFileOptions fileOptions = null
+		) where T : class, IReactEnvironment
+		{
+			var appInstance = app.UseReact(configure, fileOptions);
+			TinyIoCContainer.Current.Unregister<IReactEnvironment>();
+			TinyIoCContainer.Current.Register<IReactEnvironment, T>();
+
+			return appInstance;
+		}
+	}
+}

src/React.Core/ReactWithNodeEnvironment.cs renamed to src/React.NodeServices/ReactWithNodeEnvironment.cs

@@ -7,16 +7,13 @@
 
 using System;
 using System.Collections.Generic;
-using System.Diagnostics;
 using System.IO;
 using System.Linq;
 using System.Reflection;
-using System.Text;
-using System.Threading;
 using React.Exceptions;
 using React.TinyIoC;
 
-namespace React
+namespace React.NodeServices
 {
 	/// <summary>
 	/// Request-specific ReactJS.NET environment. This is unique to the individual request and is

src/React.Sample.Webpack.CoreMvc/Startup.cs

@@ -41,7 +41,7 @@ public void ConfigureServices(IServiceCollection services)
 		public void Configure(IApplicationBuilder app)
 		{
 			// Initialise ReactJS.NET. Must be before static files.
-			app.UseReact(config =>
+			app.UseReactWithEnvironment<ReactWithNodeEnvironment>(config =>
 			{
 				config
 					.SetReuseJavaScriptEngines(true)
@@ -51,7 +51,7 @@ public void Configure(IApplicationBuilder app)
 					.AddScriptWithoutTransform("~/dist/runtime.js")
 					.AddScriptWithoutTransform("~/dist/vendor.js")
 					.AddScriptWithoutTransform("~/dist/components.js");
-			}, useNodeEnvironment: true);
+			});
 
 			app.UseStaticFiles();