Merge branch 'feature/additional-context' of https://github.com/erikmueller/react-stdio into erikmueller-feature/additional-context

Author: mjackson

__mocks__/contextComponent.js

@@ -0,0 +1,11 @@
+const { createElement: h } = require('react')
+let context = {}
+
+const component = function() {
+  context.test = true
+  return h('div', null, 'I am a context component')
+}
+
+component.context = context
+
+module.exports = component

__mocks__/testComponent.js

@@ -0,0 +1,5 @@
+const { createElement: h } = require('react')
+
+module.exports = function() {
+  return h('div', null, 'I am a test component')
+}

__tests__/server.spec.js

@@ -0,0 +1,74 @@
+const { spawn } = require('child_process')
+const path = require('path')
+
+describe('server', function() {
+  let proc
+
+  beforeEach(function() {
+    proc = spawn(path.join(__dirname, '..', 'bin', 'react-stdio'), {
+      stdio: 'pipe'
+    })
+  })
+
+  afterEach(function() {
+    proc.kill()
+  })
+
+  it('throws an error when component is missing', function(done) {
+    proc.stdin.write(JSON.stringify({}))
+
+    proc.stdout.once('data', function(out) {
+      expect(JSON.parse(out).error).toEqual('Missing { component } in request')
+
+      done()
+    })
+  })
+
+  it('throws an error when component cannot be found', function(done) {
+    proc.stdin.write(JSON.stringify({ component: 'component.js' }))
+
+    proc.stdout.once('data', function(out) {
+      expect(JSON.parse(out).error).toEqual(
+        'Cannot load component: component.js'
+      )
+
+      done()
+    })
+  })
+
+  it('renders the component', function(done) {
+    proc.stdin.write(
+      JSON.stringify({
+        component: path.join(__dirname, '..', '__mocks__', 'testComponent.js')
+      })
+    )
+
+    proc.stdout.once('data', function(out) {
+      expect(JSON.parse(out).html).toMatch('I am a test component')
+
+      done()
+    })
+  })
+
+  it('renders a component and exposes additional context', function(done) {
+    proc.stdin.write(
+      JSON.stringify({
+        component: path.join(
+          __dirname,
+          '..',
+          '__mocks__',
+          'contextComponent.js'
+        )
+      })
+    )
+
+    proc.stdout.once('data', function(out) {
+      const result = JSON.parse(out)
+
+      expect(result.html).toMatch('I am a context component')
+      expect(result.context).toEqual({ test: true })
+
+      done()
+    })
+  })
+})

package.json

@@ -15,7 +15,8 @@
     "server.js"
   ],
   "scripts": {
-    "release": "node ./scripts/release.js"
+    "release": "node ./scripts/release.js",
+    "test": "jest"
   },
   "dependencies": {
     "JSONStream": "^1.0.7",
@@ -25,6 +26,7 @@
     "react-dom": "^15.0.1"
   },
   "devDependencies": {
+    "jest": "^21.2.1",
     "readline-sync": "^1.4.1"
   }
 }

server.js

@@ -72,20 +72,22 @@ function handleRequest(workingDir, request, callback) {
 
   invariant(component != null, "Cannot load component: %s", componentPath);
 
-  render(React.createElement(component, props), callback);
+  render(React.createElement(component, props), function(err, html) {
+    callback(err, html, component.context);
+  });
 }
 
 function createRequestHandler(workingDir) {
   return function(request, callback) {
     try {
-      handleRequest(workingDir, request, function(error, html) {
+      handleRequest(workingDir, request, function(error, html, context) {
         if (error) {
           callback(error);
         } else if (typeof html !== "string") {
           // Crash the server process.
           callback(new Error("Render method must return a string"));
         } else {
-          callback(null, JSON.stringify({ html: html }));
+          callback(null, JSON.stringify({ html: html, context: context }));
         }
       });
     } catch (error) {