Merge remote-tracking branch 'origin/master' into nonce-attribute

Author: dustinsoftware

.editorconfig

@@ -1,13 +1,13 @@
-# editorconfig.org
-root = true
-
-[*]
-charset = utf-8
-end_of_line = crlf
-indent_size = 4
-indent_style = tab
-insert_final_newline = true
-
-[*.json]
-indent_size = 2
-indent_style = space
+# editorconfig.org
+root = true
+
+[*]
+charset = utf-8
+end_of_line = lf
+indent_size = 4
+indent_style = tab
+insert_final_newline = true
+
+[*.json]
+indent_size = 2
+indent_style = space

.gitattributes

@@ -0,0 +1,5 @@
+* text eol=lf
+*.png binary
+*.exe binary
+*.dll binary
+

src/React.AspNet/HtmlHelperExtensions.cs

@@ -52,7 +52,7 @@ private static IReactEnvironment Environment
 		/// <param name="htmlTag">HTML tag to wrap the component in. Defaults to &lt;div&gt;</param>
 		/// <param name="containerId">ID to use for the container HTML tag. Defaults to an auto-generated ID</param>
 		/// <param name="clientOnly">Skip rendering server-side and only output client-side initialisation code. Defaults to <c>false</c></param>
-		/// <param name="serverOnly">Skip rendering React specific data-attributes during server side rendering. Defaults to <c>false</c></param>
+		/// <param name="serverOnly">Skip rendering React specific data-attributes, container and client-side initialisation during server side rendering. Defaults to <c>false</c></param>
 		/// <param name="containerClass">HTML class(es) to set on the container tag</param>
 		/// <param name="exceptionHandler">A custom exception handler that will be called if a component throws during a render. Args: (Exception ex, string componentName, string containerId)</param>
 		/// <returns>The component's HTML</returns>
@@ -70,7 +70,7 @@ public static IHtmlString React<T>(
 		{
 			try
 			{
-				var reactComponent = Environment.CreateComponent(componentName, props, containerId, clientOnly);
+				var reactComponent = Environment.CreateComponent(componentName, props, containerId, clientOnly, serverOnly);
 				if (!string.IsNullOrEmpty(htmlTag))
 				{
 					reactComponent.ContainerTag = htmlTag;

src/React.Core/Babel.cs

@@ -353,7 +353,7 @@ string filename
 			var contents = _fileSystem.ReadAsString(filename);
 			if (CacheIsValid(contents, outputPath))
 				return outputPath;
-			
+			
 			var result = TransformWithHeader(filename, contents, null);
 
 			var sourceMapPath = GetSourceMapOutputPath(filename);
@@ -363,14 +363,14 @@ string filename
 			return outputPath;
 		}
 
-		/// <summary>
-		/// Checks whether an input file (given as inputFileContents) should be transpiled
-		/// by calculating the hash and comparing it to the hash value stored
-		/// in the file given by outputPath. If the outputPath file does not
-		/// exist the input file should always be transpiled.
-		/// </summary>
-		/// <param name="inputFileContents">The contents of the input file.</param>
-		/// <param name="outputPath">The output path of the (possibly previously) generated file.</param>
+		/// <summary>
+		/// Checks whether an input file (given as inputFileContents) should be transpiled
+		/// by calculating the hash and comparing it to the hash value stored
+		/// in the file given by outputPath. If the outputPath file does not
+		/// exist the input file should always be transpiled.
+		/// </summary>
+		/// <param name="inputFileContents">The contents of the input file.</param>
+		/// <param name="outputPath">The output path of the (possibly previously) generated file.</param>
 		/// <returns>Returns false if the file should be transpiled, true otherwise.</returns>
 		public virtual bool CacheIsValid(string inputFileContents, string outputPath)
 		{            

src/React.Core/IReactComponent.cs

@@ -41,6 +41,11 @@ public interface IReactComponent
 		/// </summary>
 		string ContainerClass { get; set; }
 
+		/// <summary>
+		/// Get or sets if this components only should be rendered server side
+		/// </summary>
+		bool ServerOnly { get; set; }
+
 		/// <summary>
 		/// Renders the HTML for this component. This will execute the component server-side and
 		/// return the rendered HTML.

src/React.Core/IReactEnvironment.cs

@@ -80,8 +80,9 @@ public interface IReactEnvironment
 		/// <param name="props">Props to use</param>
 		/// <param name="containerId">ID to use for the container HTML tag. Defaults to an auto-generated ID</param>
 		/// <param name="clientOnly">True if server-side rendering will be bypassed. Defaults to false.</param>
+		/// <param name="serverOnly">True if this component only should be rendered server-side. Defaults to false.</param>
 		/// <returns>The component</returns>
-		IReactComponent CreateComponent<T>(string componentName, T props, string containerId = null, bool clientOnly = false);
+		IReactComponent CreateComponent<T>(string componentName, T props, string containerId = null, bool clientOnly = false, bool serverOnly = false);
 
 		/// <summary>
 		/// Adds the provided <see cref="IReactComponent"/> to the list of components to render client side.

src/React.Core/React.Core.csproj

@@ -19,10 +19,10 @@
 	<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
   </PropertyGroup>
 
-  <ItemGroup>
-    <Compile Remove="node_modules\**" />
-    <EmbeddedResource Remove="node_modules\**" />
-    <None Remove="node_modules\**" />
+  <ItemGroup>
+    <Compile Remove="node_modules\**" />
+    <EmbeddedResource Remove="node_modules\**" />
+    <None Remove="node_modules\**" />
   </ItemGroup>
 
   <ItemGroup>

src/React.Core/ReactComponent.cs

@@ -68,6 +68,11 @@ public class ReactComponent : IReactComponent
 		/// </summary>
 		public string ContainerClass { get; set; }
 
+		/// <summary>
+		/// Get or sets if this components only should be rendered server side
+		/// </summary>
+		public bool ServerOnly { get; set; }
+
 		/// <summary>
 		/// Gets or sets the props for this component
 		/// </summary>
@@ -130,6 +135,11 @@ public virtual string RenderHtml(bool renderContainerOnly = false, bool renderSe
 						? string.Format("ReactDOMServer.renderToStaticMarkup({0})", GetComponentInitialiser())
 						: string.Format("ReactDOMServer.renderToString({0})", GetComponentInitialiser());
 					html = _environment.Execute<string>(reactRenderCommand);
+
+					if (renderServerOnly)
+					{
+						return html;
+					}
 				}
 				catch (JsRuntimeException ex)
 				{

src/React.Core/ReactEnvironment.cs

@@ -14,9 +14,7 @@
 using System.Text;
 using System.Threading;
 using JavaScriptEngineSwitcher.Core;
-using JavaScriptEngineSwitcher.Core.Helpers;
 using JSPool;
-using Newtonsoft.Json;
 using React.Exceptions;
 using React.TinyIoC;
 
@@ -287,8 +285,9 @@ public virtual bool HasVariable(string name)
 		/// <param name="props">Props to use</param>
 		/// <param name="containerId">ID to use for the container HTML tag. Defaults to an auto-generated ID</param>
 		/// <param name="clientOnly">True if server-side rendering will be bypassed. Defaults to false.</param>
+		/// <param name="serverOnly">True if this component only should be rendered server-side. Defaults to false.</param>
 		/// <returns>The component</returns>
-		public virtual IReactComponent CreateComponent<T>(string componentName, T props, string containerId = null, bool clientOnly = false)
+		public virtual IReactComponent CreateComponent<T>(string componentName, T props, string containerId = null, bool clientOnly = false, bool serverOnly = false)
 		{
 			if (!clientOnly)
 			{
@@ -297,7 +296,8 @@ public virtual IReactComponent CreateComponent<T>(string componentName, T props,
 
 			var component = new ReactComponent(this, _config, componentName, containerId)
 			{
-				Props = props
+				Props = props,
+				ServerOnly = serverOnly
 			};
 			_components.Add(component);
 			return component;
@@ -339,8 +339,11 @@ public virtual string GetInitJavaScript(bool clientOnly = false)
 
 			foreach (var component in _components)
 			{
-				fullScript.Append(component.RenderJavaScript());
-				fullScript.AppendLine(";");
+				if (!component.ServerOnly)
+				{
+					fullScript.Append(component.RenderJavaScript());
+					fullScript.AppendLine(";");
+				}
 			}
 
 			return fullScript.ToString();