major: refactor

rijs · Nov 3, 2017 · fa4771a · fa4771a
1 parent 870d40d
commit fa4771a
Show file tree

Hide file tree

Showing 8 changed files with 3,702 additions and 75 deletions.
diff --git a/.babelrc b/.babelrc
diff --git a/dist/index.js b/dist/index.js
diff --git a/src/index.js → index.js b/src/index.js → index.js
@@ -1,11 +1,11 @@
 // -------------------------------------------
 // Serves the /pages directory
 // -------------------------------------------
-export default function pages(ripple, { server, dir } = {}){
+module.exports = function pages(ripple, { server, dir } = {}){
   log('creating')
-  server = ripple.server || server
-  if (!server || !dir) return ripple
-  expressify(server)
+  const { http = server } = ripple.server || {}
+  if (!http || !dir) return ripple
+  expressify(http)
     .use(compression(), serve(resolve(dir, './pages'), { redirect: false }))
     .use('*', compression(), serve(resolve(dir, './pages')))
   return ripple
@@ -15,9 +15,9 @@ const expressify = server => server.express
   || key('_events.request')(server) 
   || server.on('request', express())._events.request
 
-import compression from 'compression'
-import key from 'utilise/key'
-import { resolve } from 'path'
-import express from 'express'
-import serve from 'serve-static'
-const log = require('utilise/log')('[ri/pages]')
+const compression = require('compression')
+    , key = require('utilise/key')
+    , { resolve } = require('path')
+    , express = require('express')
+    , serve = require('serve-static')
+    , log = require('utilise/log')('[ri/pages]')