Fix assembly registration

Author: dustinsoftware

src/React.AspNet.Middleware/ReactBuilderExtensions.cs

@@ -1,4 +1,4 @@
-/*
+/*
  * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
@@ -35,11 +35,13 @@ public static class ReactBuilderExtensions
 		/// <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
+			BabelFileOptions fileOptions = null,
+			bool useNodeEnvironment = false
 		)
 		{
 			RegisterAspNetServices(React.AssemblyRegistration.Container, app.ApplicationServices);
@@ -55,6 +57,12 @@ 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.Core/AssemblyRegistration.cs

@@ -37,7 +37,7 @@ public void Register(TinyIoCContainer container)
 			container.Register<IJavaScriptEngineFactory, JavaScriptEngineFactory>().AsSingleton();
 			container.Register<IReactIdGenerator, ReactIdGenerator>().AsSingleton();
 
-			container.Register<IReactEnvironment, ReactWithNodeEnvironment>().AsPerRequestSingleton();
+			container.Register<IReactEnvironment, ReactEnvironment>().AsPerRequestSingleton();
 		}
 	}
 }

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

@@ -50,7 +50,7 @@ public void Configure(IApplicationBuilder app)
 					.AddScriptWithoutTransform("~/dist/runtime.js")
 					.AddScriptWithoutTransform("~/dist/vendor.js")
 					.AddScriptWithoutTransform("~/dist/components.js");
-			});
+			}, useNodeEnvironment: true);
 
 			app.UseStaticFiles();