From 6b6875f8f8364453b3774165f6e28a405f7f2d67 Mon Sep 17 00:00:00 2001
From: Michael Jackson <mj@mjackson.me>
Date: Sat, 28 Apr 2018 18:21:23 -0700
Subject: [PATCH] Fix failing tests

---
 server/createDevServer.js |  6 +++++-
 server/createServer.js    | 11 +++++++++--
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/server/createDevServer.js b/server/createDevServer.js
index e6bbfc1..77b4568 100644
--- a/server/createDevServer.js
+++ b/server/createDevServer.js
@@ -40,7 +40,11 @@ function createDevServer(publicDir, webpackConfig, devOrigin) {
 
   // This runs after webpack-dev-middleware
   server.use(devErrorHandler());
-  server.use(express.static(publicDir));
+
+  if (publicDir) {
+    server.use(express.static(publicDir));
+  }
+
   server.use(devAssets(compiler));
   server.use(createRouter());
 
diff --git a/server/createServer.js b/server/createServer.js
index 118537b..775adf3 100644
--- a/server/createServer.js
+++ b/server/createServer.js
@@ -36,8 +36,15 @@ function createServer(publicDir, statsFile) {
   }
 
   app.use(errorHandler);
-  app.use(express.static(publicDir, { maxAge: "365d" }));
-  app.use(staticAssets(statsFile));
+
+  if (publicDir) {
+    app.use(express.static(publicDir, { maxAge: "365d" }));
+  }
+
+  if (statsFile) {
+    app.use(staticAssets(statsFile));
+  }
+
   app.use(createRouter());
 
   const server = http.createServer(app);