1 files changed, 10 insertions, 2 deletions
diff --git a/src/server/server_Initialization.ts b/src/server/server_Initialization.ts
index 06c701468..a10cd4983 100644
--- a/src/server/server_Initialization.ts
+++ b/src/server/server_Initialization.ts
@@ -31,7 +31,7 @@ const compiler = webpack(config);
 /* RouteSetter is a wrapper around the server that prevents the server
    from being exposed. */
 export type RouteSetter = (server: RouteManager) => void;
-export let disconnect: Function;
+//export let disconnect: Function;
 
 export let resolvedPorts: { server: number, socket: number } = { server: 1050, socket: 4321 };
 export let resolvedServerUrl: string;
@@ -40,6 +40,14 @@ export default async function InitializeServer(routeSetter: RouteSetter) {
     const isRelease = determineEnvironment();
     const app = buildWithMiddleware(express());
 
+    const compiler = webpack(config);
+
+    app.use(require("webpack-dev-middleware")(compiler, {
+        publicPath: config.output.publicPath
+    }));
+
+    app.use(require("webpack-hot-middleware")(compiler));
+
     // route table managed by express.  routes are tested sequentially against each of these map rules.  when a match is found, the handler is called to process the request
     app.get(new RegExp(/^\/+$/), (req, res) => res.redirect(req.user ? "/home" : "/login")); // target urls that consist of one or more '/'s with nothing in between
     app.use(express.static(publicDirectory, { setHeaders: res => res.setHeader("Access-Control-Allow-Origin", "*") }));  //all urls that start with dash's public directory: /files/  (e.g., /files/images, /files/audio, etc)
@@ -66,7 +74,7 @@ export default async function InitializeServer(routeSetter: RouteSetter) {
     // a field on one client, that change must be broadcast to all other clients)
     await WebSocket.initialize(isRelease, app);
 
-    disconnect = async () => new Promise<Error>(resolve => server.close(resolve));
+    //disconnect = async () => new Promise<Error>(resolve => server.close(resolve));
     return isRelease;
 }