Use React from NPM. Closes #197

Also switch from `React.renderToString` to `ReactDOMServer.renderToString` now that we actually have access to `ReactDOMServer`.

Author: Daniel15

.gitignore

@@ -9,6 +9,7 @@ src/React.Sample.*/ClearScript.V8
 src/React.Sample.Webpack/build
 *.generated.js
 *.generated.js.map
+*.generated.min.js
 src/React.Sample.Mvc6/wwwroot/js/Sample.js
 *.lock.json
 src/.vs

build.proj

@@ -108,6 +108,7 @@ of patent rights can be found in the PATENTS file in the same directory.
 	</Target>
 
 	<Target Name="Build" DependsOnTargets="RestorePackages;UpdateVersion">
+		<Exec WorkingDirectory="src/React.Core" Command="gulp" />
 		<MSBuild Projects="$(SolutionFile)" Targets="Rebuild" Properties="Configuration=Release;Platform=Any CPU;NoWarn=1607,7035" />
 	</Target>
 

src/React.Core/JavaScriptEngineFactory.cs

@@ -106,10 +106,8 @@ protected virtual void InitialiseEngine(IJsEngine engine)
 			engine.ExecuteResource("React.Resources.shims.js", thisAssembly);
 			if (_config.LoadReact)
 			{
-				engine.ExecuteResource("React.Resources.react-with-addons.js", thisAssembly);
-				engine.Execute("React = global.React");
-				// Expose ReactDOM as some scripts may be using it. #yolo
-				engine.Execute("ReactDOM = React.__SECRET_DOM_DO_NOT_USE_OR_YOU_WILL_BE_FIRED");
+				// TODO: Add option to choose whether to load dev vs prod version of React.
+				engine.ExecuteResource("React.Resources.react.generated.js", thisAssembly);
 			}
 
 			LoadUserScripts(engine);
@@ -162,9 +160,10 @@ private static void EnsureReactLoaded(IJsEngine engine)
 			if (!result)
 			{
 				throw new ReactNotInitialisedException(
-					"React has not been loaded correctly. Please expose your version of React as a global " +
-					"variable named 'React', or enable the 'LoadReact' configuration option to " +
-					"use the built-in version of React."
+					"React has not been loaded correctly. Please expose your version of React as global " +
+					"variables named 'React', 'ReactDOM' and 'ReactDOMServer', or enable the " +
+					"'LoadReact' configuration option to use the built-in version of React. See " +
+					"http://reactjs.net/guides/byo-react.html for more information."
 				);
 			}
 		}

src/React.Core/React.Core.csproj

@@ -135,15 +135,18 @@
     <Compile Include="SimpleFileSystem.cs" />
     <None Include="React.Core.nutrans" />
   </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Resources\react-with-addons.js" />
-  </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="Resources\shims.js" />
   </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="node_modules\babel-core\browser.js" />
   </ItemGroup>
+  <ItemGroup>
+    <Content Include="gulpfile.js" />
+    <EmbeddedResource Include="Resources\react.generated.js" />
+    <EmbeddedResource Include="Resources\react.generated.min.js" />
+    <Content Include="Resources\react.js" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.

src/React.Core/ReactComponent.cs

@@ -90,8 +90,8 @@ public virtual string RenderHtml(bool renderContainerOnly = false, bool renderSe
 				if (!renderContainerOnly)
 				{
 					var reactRenderCommand = renderServerOnly
-						? string.Format("React.renderToStaticMarkup({0})", GetComponentInitialiser())
-						: string.Format("React.renderToString({0})", GetComponentInitialiser());
+						? string.Format("ReactDOMServer.renderToStaticMarkup({0})", GetComponentInitialiser())
+						: string.Format("ReactDOMServer.renderToString({0})", GetComponentInitialiser());
 					html = _environment.Execute<string>(reactRenderCommand);
 				}
 				return string.Format(