From 2eefb8ff823daf0602110cb8b60caa76d0335657 Mon Sep 17 00:00:00 2001
From: Vladimir Metnev <vladimirmetnew@gmail.com>
Date: Sun, 18 Feb 2018 16:09:12 +0200
Subject: [PATCH] fix(server): move server creation to ./server/index

fix(server): move server creation to ./server/index
---
 src/server/index.js  | 23 +++++++++++++++++++++++
 src/server/server.js | 27 ---------------------------
 2 files changed, 23 insertions(+), 27 deletions(-)
 create mode 100644 src/server/index.js
 delete mode 100644 src/server/server.js

diff --git a/src/server/index.js b/src/server/index.js
new file mode 100644
index 00000000..bce4de0b
--- /dev/null
+++ b/src/server/index.js
@@ -0,0 +1,23 @@
+/**
+ * @flow
+ * @file
+ */
+import 'babel-polyfill'
+import express from 'express'
+import fetch from 'isomorphic-fetch'
+import addMiddlewares from './middlewares'
+import API from './api'
+import SSR from './ssr'
+
+global.fetch = fetch
+
+const app: express$Application = express()
+
+// Add global middlewares
+addMiddlewares(app)
+// Add API
+app.use('/api', API)
+// Add SSR
+app.use(SSR)
+
+export default app
diff --git a/src/server/server.js b/src/server/server.js
deleted file mode 100644
index 3eb2ef2a..00000000
--- a/src/server/server.js
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * @flow
- */
-import addMiddlewares from './middlewares'
-import API from './api'
-import SSR from './ssr'
-import fetch from 'isomorphic-fetch'
-import FormData from 'form-data'
-
-global.fetch = fetch
-global.window = {}
-global.FormData = FormData
-
-/**
- * Mount API, SSR and middlewares to app.
- * @param  {express$Application} app - Express server instance
- * @return {express$Application}     - Decorated server instance
- */
-export default (app: express$Application): express$Application => {
-	// Add global middlewares
-	addMiddlewares(app)
-	// Add API
-	app.use(process.env.BASE_API, API)
-	// Add SSR
-	app.use(SSR)
-	return app
-}