feat: real express middleware-like api

mrtnbroder · mrtnbroder · commit 11082baf4100 · 2017-04-12T01:38:37.000+02:00
diff --git a/src/server/index.js b/src/server/index.js
@@ -22,11 +22,11 @@ if (isDev) {
 }
 
 // I. Static Assets
-m.staticMiddleware(app)
+app.use(m.staticMiddleware)
 // II. API
-m.apiMiddleware(app)
+app.use(m.apiMiddleware)
 // III. Views
-m.viewMiddleware(app)
+app.use(m.viewMiddleware)
 
 //
 // Initialise Express
diff --git a/src/server/middlewares/apiMiddleware.js b/src/server/middlewares/apiMiddleware.js
@@ -9,19 +9,21 @@ import express from 'express'
 
 const API_URL = '/api/v1'
 
-export default (app) => {
-  // Parse application/json bodys
-  app.use(bodyParser.json())
-  // Parse application/x-www-form-urlencoded bodys
-  app.use(bodyParser.urlencoded({ extended: true }))
-  // create restful routes
-  Object.keys(resources).forEach(makeResource)
+const app = express.Router()
 
-  function makeResource(routeName) {
-    const router = express.Router()
+// Parse application/json bodys
+app.use(bodyParser.json())
+// Parse application/x-www-form-urlencoded bodys
+app.use(bodyParser.urlencoded({ extended: true }))
+// create restful routes
+Object.keys(resources).forEach(makeResource)
 
-    resources[routeName](router)
+function makeResource(routeName) {
+  const router = express.Router()
 
-    app.use(`${API_URL}/${routeName}`, router)
-  }
+  resources[routeName](router)
+
+  app.use(`${API_URL}/${routeName}`, router)
 }
+
+export default app
diff --git a/src/server/middlewares/staticMiddleware.js b/src/server/middlewares/staticMiddleware.js
@@ -9,7 +9,4 @@ import express from 'express'
 const MAX_AGE = isDev ? 0 : '1 year'
 const staticCache = { maxAge: MAX_AGE, etag: true, lastModified: false }
 
-export default (app) => {
-  // root dir assets
-  app.use(express.static(outputPath, staticCache))
-}
+export default express.static(outputPath, staticCache)
diff --git a/src/server/middlewares/viewMiddleware.js b/src/server/middlewares/viewMiddleware.js
@@ -13,38 +13,36 @@ import configureStore from 'configureStore'
 import Html from '../components/Html.jsx'
 import reducers from '../../shared/modules'
 
-export default (app) => {
-  // match everything else
-  app.get('*', handleRequests)
-
-  function handleRequests({ url: location }, res) {
-    match({ routes, location }, (err, redirect, renderProps) => {
-      if (err)
-        res.status(500).send(err.message)
-      else if (redirect)
-        res.status(302).redirect(redirect.pathname + redirect.search)
-      else if (renderProps) {
-        const store = configureStore(reducers)()
-        const html = renderHtml(renderProps, store)
-
-        res.status(200).send(html)
-      } else
-        res.status(404).send('404')
-    })
-  }
-
-  function renderHtml(nextProps, store) {
-    const initalState = store.getState()
-    const provider = (
-      createElement(Provider, { store },
-        createElement(RouterContext, nextProps)
-      )
-    )
-    const content = renderToString(provider)
-    const markup = renderToStaticMarkup(
-      createElement(Html, { content, initalState })
+function handleRequests({ url: location }, res) {
+  match({ routes, location }, (err, redirect, renderProps) => {
+    if (err) {
+      res.status(500).send(err.message)
+    } else if (redirect) {
+      res.status(302).redirect(redirect.pathname + redirect.search)
+    } else if (renderProps) {
+      const store = configureStore(reducers)()
+      const html = renderHtml(renderProps, store)
+
+      res.status(200).send(html)
+    } else {
+      res.status(404).send('404')
+    }
+  })
+}
+
+function renderHtml(nextProps, store) {
+  const initalState = store.getState()
+  const provider = (
+    createElement(Provider, { store },
+      createElement(RouterContext, nextProps)
     )
+  )
+  const content = renderToString(provider)
+  const markup = renderToStaticMarkup(
+    createElement(Html, { content, initalState })
+  )
 
-    return `<!doctype html>${markup}`
-  }
+  return `<!doctype html>${markup}`
 }
+
+export default handleRequests
