Merge pull request #4 from szarouski/developer

release 1.0.0

Author: Sergey Zarouski

README.md

@@ -113,4 +113,8 @@ module.exports = React.createClass({
         );
     }
 });
-```
+```
+
+## Error handling
+
+sourcejs-react will show errors right on the page when sourcejs is launched in development mode and log errors via console.error when in other (production) mode.

core/middleware/error.jsx

@@ -0,0 +1,15 @@
+var React = require('react/addons');
+module.exports = React.createClass({
+    displayName: 'error.jsx',
+    propTypes: {
+        stack: React.PropTypes.string.isRequired
+    },
+    render: function () {
+        return (
+            <div style={{color: 'red'}}>
+                <h1>Error: </h1>
+                <p dangerouslySetInnerHTML={{__html: this.props.stack.replace(/\n/g, '<br>')}}></p>
+            </div>
+        );
+    }
+});

core/middleware/index.js

@@ -14,16 +14,41 @@ var _ = require('lodash');
  * */
 exports.process = function (req, res, next) {
     if (req.specData && req.specData.isJsx) {
-        var pathToFile = path.join(global.app.get('user'), req.url);
         _.each(require.cache, function cleanAllJsxReferences(cacheObj, key) {
             if (path.extname(key) === '.jsx') {
                 delete require.cache[key];
             }
         });
-        var component = require(pathToFile);
-        var factory = React.createFactory(component);
-        req.specData.renderedHtml = React.renderToString(factory({}));
+        var pathToFile = path.join(global.app.get('user'), req.url);
+        var html;
+        try {
+            var component = React.createFactory(require(pathToFile));
+            html = getHtml(component);
+        } catch (ex) {
+            html = getErrorAsHtml(ex);
+        }
+        req.specData.renderedHtml = html;
     }
 
     next();
-};
+};
+
+function getHtml(component) {
+    try {
+        return React.renderToString(component({}));
+    } catch(ex) {
+        return getErrorAsHtml(ex);
+    }
+}
+
+function getErrorAsHtml(ex) {
+    if (global.MODE !== 'development') {
+        console.error(ex);
+        return 'Server error';
+    }
+
+    var error = React.createFactory(require('./error.jsx'));
+    return React.renderToString(error({
+        stack: ex.stack
+    }));
+}

package.json

@@ -1,6 +1,6 @@
 {
   "name": "sourcejs-react",
-  "version": "0.0.3",
+  "version": "1.0.0",
   "description": "React middleware for sourcejs.com",
   "main": "index.js",
   "dependencies": {