Version 0.1.2

Jaymun723 · Nov 10, 2017 · 68c3de5 · 68c3de5
1 parent 95affee
commit 68c3de5
Show file tree

Hide file tree

Showing 5 changed files with 69 additions and 77 deletions.
diff --git a/index.js b/index.js
@@ -1,4 +1,68 @@
-// Exports
-exports.set = require('./src/set')
-exports.createEngine = require('./src/engine')
-exports.servBundle = require('./src/servBundle')
+var React = require('react')
+var ReactDOMServer = require('react-dom/server')
+var _escaperegexp = require('lodash.escaperegexp')
+var beautifyHTML = require('js-beautify').html
+var express = require('express')
+var browserify = require('browserify')
+var path = require('path')
+var router = express.Router()
+
+module.exports = {
+  set (arg, text) {
+    if (arg === 'bundleDir') {
+      router.all('/:name', function (req, res) {
+        browserify()
+          .add(path.join(`${text}`, `${req.params.name}.jsx`))
+          .transform('babelify', {presets: ['env', 'react']})
+          .bundle()
+          .pipe(res)
+      })
+    }
+  },
+
+  createEngine (engineOptions = {}) {
+    let registered = false
+    let moduleDetectRegEx
+
+    function renderFile (filename, options, callback) {
+      if (!moduleDetectRegEx) {
+        moduleDetectRegEx = new RegExp([].concat(options.settings.views).map(viewPath => '^' + _escaperegexp(viewPath)).join('|'))
+      }
+
+      if (!registered) {
+        require('babel-register')({
+          extensions: ['.jsx'],
+          presets: ['react', 'env']
+        })
+        registered = true
+      }
+
+      try {
+        let component = require(filename)
+        component = component.default || component
+        component = React.createElement(component, options)
+        var result = '<!DOCTYPE html>' + ReactDOMServer.renderToString(component)
+      } catch (error) {
+        callback(error, null)
+      } finally {
+        if (options.settings.env === 'development') {
+          Object.keys(require.cache).forEach(function (module) {
+            if (moduleDetectRegEx.test(require.cache[module].filename)) {
+              delete require.cache[module]
+            }
+          })
+        }
+
+        if (engineOptions.beautify) {
+          result = beautifyHTML(result)
+        }
+
+        callback(null, result)
+      }
+    }
+    return renderFile
+  },
+
+  servBundle: router
+
+}
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "express-react-server",
-  "version": "0.1.1",
+  "version": "0.1.2",
   "description": "Utility module to build a server with react and express.",
   "keywords": [
     "express",
@@ -28,10 +28,5 @@
     "lodash.escaperegexp": "^4.1.2",
     "react": "^16.0.0",
     "react-dom": "^16.0.0"
-  },
-  "standard": {
-    "globals": [
-      "bundleDir"
-    ]
   }
 }
diff --git a/src/engine.js b/src/engine.js
diff --git a/src/servBundle.js b/src/servBundle.js
diff --git a/src/set.js b/src/set.js