Simplify ReactRenderer API when referencing default modules

SteveSandersonMS · SteveSandersonMS · commit 0c59f670b295 · 2015-11-02T20:23:05.000-08:00
diff --git a/Microsoft.AspNet.NodeServices.React/Content/Node/react-rendering.js b/Microsoft.AspNet.NodeServices.React/Content/Node/react-rendering.js
@@ -27,7 +27,7 @@ module.exports = {
     renderToString: function(callback, options) {
         var resolvedPath = path.resolve(process.cwd(), options.moduleName);
         var requestedModule = require(resolvedPath);
-        var component = requestedModule[options.exportName]; 
+        var component = options.exportName ? requestedModule[options.exportName] : requestedModule; 
         if (!component) {
             throw new Error('The module "' + resolvedPath + '" has no export named "' + options.exportName + '"');
         }
diff --git a/Microsoft.AspNet.NodeServices.React/ReactRenderer.cs b/Microsoft.AspNet.NodeServices.React/ReactRenderer.cs
@@ -12,6 +12,10 @@ static ReactRenderer() {
             nodeScript = new StringAsTempFile(script); // Will be cleaned up on process exit
         }
         
+        public static Task<string> RenderToString(INodeServices nodeServices, string moduleName, string baseUrl) {
+            return RenderToString(nodeServices, moduleName, /* exportName */ null, baseUrl);
+        }
+        
         public static async Task<string> RenderToString(INodeServices nodeServices, string moduleName, string exportName, string baseUrl) {
             return await nodeServices.InvokeExport(nodeScript.FileName, "renderToString", new {
                 moduleName,
diff --git a/samples/react/ReactGrid/Controllers/HomeController.cs b/samples/react/ReactGrid/Controllers/HomeController.cs
@@ -17,7 +17,6 @@ public async Task<IActionResult> Index(int pageIndex)
         {
             ViewData["ReactOutput"] = await ReactRenderer.RenderToString(this.nodeServices,
                 moduleName: "ReactApp/components/ReactApp.jsx",
-                exportName: "ReactApp",
                 baseUrl: Request.Path
             );
             return View();
diff --git a/samples/react/ReactGrid/ReactApp/boot-client.jsx b/samples/react/ReactGrid/ReactApp/boot-client.jsx
@@ -1,7 +1,7 @@
 import React from 'react';
 import ReactDOM from 'react-dom';
 import createBrowserHistory from 'history/lib/createBrowserHistory';
-import { ReactApp } from './components/ReactApp.jsx';
+import ReactApp from './components/ReactApp.jsx';
 
 // In the browser, we render into a DOM node and hook up to the browser's history APIs
 var history = createBrowserHistory();
diff --git a/samples/react/ReactGrid/ReactApp/components/ReactApp.jsx b/samples/react/ReactGrid/ReactApp/components/ReactApp.jsx
@@ -2,7 +2,7 @@ import React from 'react';
 import { Router, Route } from 'react-router';
 import { PeopleGrid } from './PeopleGrid.jsx';
 
-export class ReactApp extends React.Component {
+export default class ReactApp extends React.Component {
     render() {
         return (
             <Router history={this.props.history}>

Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ module.exports = {`
`27`	`27`	`renderToString: function(callback, options) {`
`28`	`28`	`var resolvedPath = path.resolve(process.cwd(), options.moduleName);`
`29`	`29`	`var requestedModule = require(resolvedPath);`
`30`		`- var component = requestedModule[options.exportName];`
	`30`	`+ var component = options.exportName ? requestedModule[options.exportName] : requestedModule;`
`31`	`31`	`if (!component) {`
`32`	`32`	`throw new Error('The module "' + resolvedPath + '" has no export named "' + options.exportName + '"');`
`33`	`33`	`}`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,6 @@ public async Task<IActionResult> Index(int pageIndex)`
`17`	`17`	`{`
`18`	`18`	`ViewData["ReactOutput"] = await ReactRenderer.RenderToString(this.nodeServices,`
`19`	`19`	`moduleName: "ReactApp/components/ReactApp.jsx",`
`20`		`- exportName: "ReactApp",`
`21`	`20`	`baseUrl: Request.Path`
`22`	`21`	`);`
`23`	`22`	`return View();`