Switch to Babel

 - Remove JSXTransformer and instead use "browser" build of Babel
 - Remove useHarmony and stripTypes settings (no longer relevant)
 - Remove obsolete `LoadJsxFile` and `TransformJsx` from `IReactEnvironment` - These have been marked as obsolete for a long time now

#138

Author: Daniel15

build.proj

@@ -9,9 +9,9 @@ of patent rights can be found in the PATENTS file in the same directory.
 -->
 <Project ToolsVersion="4.0" DefaultTargets="Build;Test;Package" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 	<PropertyGroup>
-		<Major>1</Major>
-		<Minor>5</Minor>
-		<Build>6</Build>
+		<Major>2</Major>
+		<Minor>0</Minor>
+		<Build>0</Build>
 		<Revision>0</Revision>
 		<DevNuGetServer>http://reactjs.net/packages/</DevNuGetServer>
 		<MSBuildCommunityTasksPath>$(MSBuildProjectDirectory)\tools\MSBuildTasks</MSBuildCommunityTasksPath>
@@ -51,6 +51,11 @@ of patent rights can be found in the PATENTS file in the same directory.
 			WorkingDirectory="$(MSBuildProjectDirectory)"
 			Command="dnu restore --quiet --parallel"
 		/>
+		<!-- npm packages -->
+		<Exec
+			WorkingDirectory="src/React.Core"
+			Command="npm install"
+		/>
 	</Target>
 
 	<Target Name="UpdateVersion">

src/React.AspNet/project.json

@@ -1,5 +1,5 @@
 {
-    "version": "1.5.6-*",
+    "version": "2.0.0-*",
     "configurations": {
         "Debug": {
             "compilationOptions": {

src/React.Core/FileCacheHash.cs

@@ -21,7 +21,7 @@ public class FileCacheHash : IFileCacheHash
 		/// <summary>
 		/// Prefix used for hash line in transformed file. Used for caching.
 		/// </summary>
-		private const string HASH_PREFIX = "// @hash v2-";
+		private const string HASH_PREFIX = "// @hash v3-";
 
 		/// <summary>
 		/// Althorithm for calculating file hashes

src/React.Core/IJsxTransformer.cs

@@ -18,13 +18,8 @@ public interface IJsxTransformer
 		/// Transforms a JSX file. Results of the JSX to JavaScript transformation are cached.
 		/// </summary>
 		/// <param name="filename">Name of the file to load</param>
-		/// <param name="useHarmony"><c>true</c> if support for ES6 syntax should be enabled</param>
-		/// <param name="stripTypes">
-		/// Whether Flow types should be stripped out. Defaults to the value set in the site
-		/// configuration.
-		/// </param>
 		/// <returns>JavaScript</returns>
-		string TransformJsxFile(string filename, bool? useHarmony = null, bool? stripTypes = null);
+		string TransformJsxFile(string filename);
 
 		/// <summary>
 		/// Transforms a JSX file to regular JavaScript and also returns a source map to map the
@@ -35,57 +30,35 @@ public interface IJsxTransformer
 		/// <param name="forceGenerateSourceMap">
 		/// <c>true</c> to re-transform the file if a cached version with no source map is available
 		/// </param>
-		/// <param name="useHarmony"><c>true</c> if support for ES6 syntax should be enabled</param>
-		/// <param name="stripTypes">
-		/// Whether Flow types should be stripped out. Defaults to the value set in the site
-		/// configuration.
-		/// </param>
 		/// <returns>JavaScript and source map</returns>
 		JavaScriptWithSourceMap TransformJsxFileWithSourceMap(
 			string filename, 
-			bool forceGenerateSourceMap = false, 
-			bool? useHarmony = null, 
-			bool? stripTypes = null
+			bool forceGenerateSourceMap = false
 		);
 
 		/// <summary>
 		/// Transforms JSX into regular JavaScript. The result is not cached. Use 
 		/// <see cref="TransformJsxFile"/> if loading from a file since this will cache the result.
 		/// </summary>
 		/// <param name="input">JSX</param>
-		/// <param name="useHarmony"><c>true</c> if support for ES6 syntax should be enabled</param>
-		/// <param name="stripTypes">
-		/// Whether Flow types should be stripped out. Defaults to the value set in the site
-		/// configuration.
-		/// </param>
 		/// <returns>JavaScript</returns>
-		string TransformJsx(string input, bool? useHarmony = null, bool? stripTypes = null);
+		string TransformJsx(string input);
 
 		/// <summary>
 		/// Transforms JSX to regular JavaScript and also returns a source map to map the compiled
 		/// source to the original version. The result is not cached.
 		/// </summary>
 		/// <param name="input">JSX</param>
-		/// <param name="useHarmony"><c>true</c> if support for ES6 syntax should be enabled</param>
-		/// <param name="stripTypes">
-		/// Whether Flow types should be stripped out. Defaults to the value set in the site
-		/// configuration.
-		/// </param>
 		/// <returns>JavaScript and source map</returns>
-		JavaScriptWithSourceMap TransformJsxWithSourceMap(string input, bool? useHarmony = null, bool? stripTypes = null);
+		JavaScriptWithSourceMap TransformJsxWithSourceMap(string input);
 
 		/// <summary>
 		/// Transforms a JSX file to JavaScript, and saves the result into a ".generated.js" file 
 		/// alongside the original file.
 		/// </summary>
 		/// <param name="filename">Name of the file to load</param>
-		/// <param name="useHarmony"><c>true</c> if support for ES6 syntax should be enabled</param>
-		/// <param name="stripTypes">
-		/// Whether Flow types should be stripped out. Defaults to the value set in the site
-		/// configuration.
-		/// </param>
 		/// <returns>File contents</returns>
-		string TransformAndSaveJsxFile(string filename, bool? useHarmony = null, bool? stripTypes = null);
+		string TransformAndSaveJsxFile(string filename);
 
 		/// <summary>
 		/// Returns the path the specified JSX file's compilation will be cached to

src/React.Core/IReactEnvironment.cs

@@ -92,23 +92,6 @@ public interface IReactEnvironment
 		/// <returns>JavaScript for all components</returns>
 		string GetInitJavaScript();
 
-		/// <summary>
-		/// Loads a JSX file. Results of the JSX to JavaScript transformation are cached.
-		/// </summary>
-		/// <param name="filename">Name of the file to load</param>
-		/// <returns>File contents</returns>
-		[Obsolete("Use JsxTransformer.TransformJsxFile")]
-		string LoadJsxFile(string filename);
-
-		/// <summary>
-		/// Transforms JSX into regular JavaScript. The result is not cached. Use 
-		/// <see cref="LoadJsxFile"/> if loading from a file since this will cache the result.
-		/// </summary>
-		/// <param name="input">JSX</param>
-		/// <returns>JavaScript</returns>
-		[Obsolete("Use JsxTransformer.TransformJsx")]
-		string TransformJsx(string input);
-
 		/// <summary>
 		/// Gets the JSX Transformer for this environment.
 		/// </summary>

src/React.Core/IReactSiteConfiguration.cs

@@ -54,17 +54,6 @@ public interface IReactSiteConfiguration
 		/// </summary>
 		IEnumerable<string> ScriptsWithoutTransform { get; } 
 
-		/// <summary>
-		/// A value indicating if es6 syntax should be rewritten.
-		/// </summary>
-		/// <returns><c>true</c> if support for es6 syntax should be rewritten.</returns>
-		bool UseHarmony { get; set; }
-
-		/// <summary>
-		/// Specifies whether ES6 (harmony) syntax should be transformed
-		/// </summary>
-		IReactSiteConfiguration SetUseHarmony(bool useHarmony);
-
 		/// <summary>
 		/// Gets or sets whether JavaScript engines should be reused across requests.
 		/// </summary>
@@ -90,15 +79,6 @@ public interface IReactSiteConfiguration
 		/// <param name="settings">The settings.</param>
 		IReactSiteConfiguration SetJsonSerializerSettings(JsonSerializerSettings settings);
 
-		/// <summary>
-		/// Gets or sets whether Flow types should be stripped out.
-		/// </summary>
-		bool StripTypes { get; set; }
-		/// <summary>
-		/// Sets whether Flow types should be stripped out.
-		/// </summary>
-		IReactSiteConfiguration SetStripTypes(bool stripTypes);
-
 		/// <summary>
 		/// Gets or sets the number of engines to initially start when a pool is created. 
 		/// Defaults to <c>10</c>.

src/React.Core/JavaScriptEngineFactory.cs

@@ -100,7 +100,8 @@ protected virtual void InitialiseEngine(IJsEngine engine)
 			{
 				engine.ExecuteResource("React.Resources.react-with-addons.js", thisAssembly);
 				engine.Execute("React = global.React");
-				engine.ExecuteResource("React.Resources.JSXTransformer.js", thisAssembly);
+				// TODO: Make this configurable, so we don't load Babel if it's not needed.
+				engine.ExecuteResource("React.node_modules.babel_core.browser.js", thisAssembly);
 			}
 
 			LoadUserScripts(engine);

src/React.Core/JsxTransformer.cs

@@ -22,7 +22,7 @@ public class JsxTransformer : IJsxTransformer
 		/// <summary>
 		/// Cache key for JSX to JavaScript compilation
 		/// </summary>
-		protected const string JSX_CACHE_KEY = "JSX_v2_{0}";
+		protected const string JSX_CACHE_KEY = "JSX_v3_{0}";
 		/// <summary>
 		/// Suffix to append to compiled files
 		/// </summary>
@@ -78,15 +78,10 @@ public JsxTransformer(IReactEnvironment environment, ICache cache, IFileSystem f
 		/// Transforms a JSX file. Results of the JSX to JavaScript transformation are cached.
 		/// </summary>
 		/// <param name="filename">Name of the file to load</param>
-		/// <param name="useHarmony"><c>true</c> if support for es6 syntax should be rewritten.</param>
-		/// <param name="stripTypes">
-		/// Whether Flow types should be stripped out. Defaults to the value set in the site
-		/// configuration.
-		/// </param>
 		/// <returns>JavaScript</returns>
-		public virtual string TransformJsxFile(string filename, bool? useHarmony = null, bool? stripTypes = null)
+		public virtual string TransformJsxFile(string filename)
 		{
-			return TransformJsxFileWithSourceMap(filename, false, useHarmony, stripTypes).Code;
+			return TransformJsxFileWithSourceMap(filename, false).Code;
 		}
 
 		/// <summary>
@@ -98,17 +93,10 @@ public virtual string TransformJsxFile(string filename, bool? useHarmony = null,
 		/// <param name="forceGenerateSourceMap">
 		/// <c>true</c> to re-transform the file if a cached version with no source map is available
 		/// </param>
-		/// <param name="useHarmony"><c>true</c> if support for ES6 syntax should be enabled</param>
-		/// <param name="stripTypes">
-		/// Whether Flow types should be stripped out. Defaults to the value set in the site
-		/// configuration.
-		/// </param>
 		/// <returns>JavaScript and source map</returns>
 		public virtual JavaScriptWithSourceMap TransformJsxFileWithSourceMap(
 			string filename,
-			bool forceGenerateSourceMap = false, 
-			bool? useHarmony = null,
-			bool? stripTypes = null
+			bool forceGenerateSourceMap = false
 		)
 		{
 			var cacheKey = string.Format(JSX_CACHE_KEY, filename);
@@ -131,7 +119,7 @@ public virtual JavaScriptWithSourceMap TransformJsxFileWithSourceMap(
 				// 3. Not cached, perform the transformation
 				try
 				{
-					output = TransformJsxWithHeader(filename, contents, hash, useHarmony, stripTypes);
+					output = TransformJsxWithHeader(filename, contents, hash);
 				}
 				catch (JsxException ex)
 				{
@@ -223,26 +211,19 @@ protected virtual JavaScriptWithSourceMap LoadJsxFromFileCache(string filename,
 		/// <param name="filename">Name of the file being transformed</param>
 		/// <param name="contents">Contents of the input file</param>
 		/// <param name="hash">Hash of the input. If null, it will be calculated</param>
-		/// <param name="useHarmony"><c>true</c> if support for es6 syntax should be rewritten.</param>
-		/// <param name="stripTypes">
-		/// Whether Flow types should be stripped out. Defaults to the value set in the site
-		/// configuration.
-		/// </param>
 		/// <returns>JavaScript</returns>
 		protected virtual JavaScriptWithSourceMap TransformJsxWithHeader(
 			string filename, 
 			string contents, 
-			string hash = null,
-			bool? useHarmony = null,
-			bool? stripTypes = null
+			string hash = null
 		)
 		{
 			if (string.IsNullOrEmpty(hash))
 			{
 				hash = _fileCacheHash.CalculateHash(contents);
 			}
 			var header = GetFileHeader(hash);
-			var result = TransformJsxWithSourceMap(header + contents, useHarmony, stripTypes);
+			var result = TransformJsxWithSourceMap(header + contents);
 			result.Hash = hash;
 			if (result.SourceMap != null)
 			{
@@ -262,21 +243,14 @@ protected virtual JavaScriptWithSourceMap TransformJsxWithHeader(
 		/// <see cref="TransformJsxFile"/> if loading from a file since this will cache the result.
 		/// </summary>
 		/// <param name="input">JSX</param>
-		/// <param name="useHarmony"><c>true</c> if support for es6 syntax should be rewritten.</param>
-		/// <param name="stripTypes">
-		/// Whether Flow types should be stripped out. Defaults to the value set in the site
-		/// configuration.
-		/// </param>
 		/// <returns>JavaScript</returns>
-		public virtual string TransformJsx(string input, bool? useHarmony = null, bool? stripTypes = null)
+		public virtual string TransformJsx(string input)
 		{
 			try
 			{
 				var output = _environment.ExecuteWithLargerStackIfRequired<string>(
 					"ReactNET_transform",
-					input,
-					useHarmony ?? _config.UseHarmony,
-					stripTypes ?? _config.StripTypes
+					input
 				);
 				return output;
 			}
@@ -291,25 +265,16 @@ public virtual string TransformJsx(string input, bool? useHarmony = null, bool?
 		/// source to the original version. The result is not cached.
 		/// </summary>
 		/// <param name="input">JSX</param>
-		/// <param name="useHarmony"><c>true</c> if support for ES6 syntax should be enabled</param>
-		/// <param name="stripTypes">
-		/// Whether Flow types should be stripped out. Defaults to the value set in the site
-		/// configuration.
-		/// </param>
 		/// <returns>JavaScript and source map</returns>
 		public virtual JavaScriptWithSourceMap TransformJsxWithSourceMap(
-			string input, 
-			bool? useHarmony = null,
-			bool? stripTypes = null
+			string input
 		)
 		{
 			try
 			{
 				return _environment.ExecuteWithLargerStackIfRequired<JavaScriptWithSourceMap>(
 					"ReactNET_transform_sourcemap",
-					input,
-					useHarmony ?? _config.UseHarmony,
-					stripTypes ?? _config.StripTypes
+					input
 				);
 			}
 			catch (Exception ex)
@@ -365,22 +330,15 @@ public virtual string GetSourceMapOutputPath(string path)
 		/// alongside the original file.
 		/// </summary>
 		/// <param name="filename">Name of the file to load</param>
-		/// <param name="useHarmony"><c>true</c> if support for es6 syntax should be rewritten.</param>
-		/// <param name="stripTypes">
-		/// Whether Flow types should be stripped out. Defaults to the value set in the site
-		/// configuration.
-		/// </param>
 		/// <returns>File contents</returns>
 		public virtual string TransformAndSaveJsxFile(
-			string filename, 
-			bool? useHarmony = null, 
-			bool? stripTypes = null
+			string filename
 		)
 		{
 			var outputPath = GetJsxOutputPath(filename);
 			var sourceMapPath = GetSourceMapOutputPath(filename);
 			var contents = _fileSystem.ReadAsString(filename);
-			var result = TransformJsxWithHeader(filename, contents, null, useHarmony, stripTypes);
+			var result = TransformJsxWithHeader(filename, contents, null);
 			_fileSystem.WriteAsString(outputPath, result.Code);
 			_fileSystem.WriteAsString(sourceMapPath, result.SourceMap == null ? string.Empty : result.SourceMap.ToJson());
 			return outputPath;

src/React.Core/React.Core.csproj

@@ -128,9 +128,6 @@
     <Compile Include="TinyIoCExtensions.cs" />
     <Compile Include="TinyIoC\TinyIoC.cs" />
   </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Resources\JSXTransformer.js" />
-  </ItemGroup>
   <ItemGroup>
     <None Include="packages.config" />
     <Compile Include="SimpleFileSystem.cs" />
@@ -142,7 +139,9 @@
   <ItemGroup>
     <EmbeddedResource Include="Resources\shims.js" />
   </ItemGroup>
-  <ItemGroup />
+  <ItemGroup>
+    <EmbeddedResource Include="node_modules\babel-core\browser.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/ReactEnvironment.cs

@@ -304,29 +304,6 @@ public virtual string GetInitJavaScript()
 			return fullScript.ToString();
 		}
 
-		/// <summary>
-		/// Loads a JSX file. Results of the JSX to JavaScript transformation are cached.
-		/// </summary>
-		/// <param name="filename">Name of the file to load</param>
-		/// <returns>File contents</returns>
-		[Obsolete("Use JsxTransformer.TransformJsxFile")]
-		public string LoadJsxFile(string filename)
-		{
-			return JsxTransformer.TransformJsxFile(filename);
-		}
-
-		/// <summary>
-		/// Transforms JSX into regular JavaScript. The result is not cached. Use 
-		/// <see cref="LoadJsxFile"/> if loading from a file since this will cache the result.
-		/// </summary>
-		/// <param name="input">JSX</param>
-		/// <returns>JavaScript</returns>
-		[Obsolete("Use JsxTransformer.TransformJsx")]
-		public string TransformJsx(string input)
-		{
-			return JsxTransformer.TransformJsx(input);
-		}
-
 		/// <summary>
 		/// Attempts to execute the provided JavaScript code using the current engine. If an 
 		/// exception is thrown, retries the execution using a new thread (and hence a new engine)