City-of-Helsinki · Rikuoja · Oct 4, 2017 · Sep 25, 2017
diff --git a/__tests__/server-rendered-hearing.js b/__tests__/server-rendered-hearing.js
diff --git a/package.json b/package.json
@@ -3,7 +3,7 @@
   "version": "0.0.0",
   "main": "index.js",
   "scripts": {
-    "start": "node server --server-rendering",
+    "start": "node server",
     "build": "true",
     "dev": "node server --dev",
     "lint": "eslint src server test",

diff --git a/server/getSettings.js b/server/getSettings.js
@@ -14,7 +14,6 @@ const defaults = {
   sessionSecret: null,
   uiConfig: null,
   dev: false,
-  serverRendering: false,
   cold: false,
   bundleSrc: null, // Usually generated by the boot-time compilation process
 };
@@ -47,5 +46,8 @@ export default function getOptions() {
   if (missingKeys.length) {
     throw new Error("These configuration values are required but are currently missing: " + missingKeys.join(", "));
   }
+  if (settings.serverRendering) {
+    throw new Error("Server rendering is not currently supported.");
+  }
   return settings;
 }
diff --git a/server/render-middleware.js b/server/render-middleware.js
@@ -1,4 +1,18 @@
-import render from "./render";
+import React from 'react';
+import {renderToStaticMarkup} from 'react-dom/server';
+import Html from './Html';
+
+
+function renderHTMLSkeleton(req, res, settings) {
+  const html = renderToStaticMarkup(
+    <Html
+      bundleSrc={settings.bundleSrc || '/app.js'}
+      apiBaseUrl={settings.apiBaseUrl}
+      uiConfig={settings.uiConfig}
+    />
+  );
+  res.status(200).send(html);
+}
 
 export default function renderMiddleware(settings) {
   return (req, res, next) => {
@@ -21,6 +35,6 @@ export default function renderMiddleware(settings) {
     if (req.url.indexOf(".") > -1) {
       return next();
     }
-    return render(req, res, settings);
+    return renderHTMLSkeleton(req, res, settings);
   };
 }
diff --git a/server/render.js b/server/render.js