fix option to disable bable register on runtime

magalhas · Mar 28, 2015 · 211b323 · 211b323
1 parent c4a5d48
commit 211b323
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 5 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1 +1,2 @@
+*.log
 node_modules/
diff --git a/index.js b/index.js
@@ -1,18 +1,20 @@
 'use strict';
 
 var React = require('react');
-var merge = require('lodash.merge');
+var defaults = require('lodash.defaults');
 var path = require('path');
 
 module.exports = function engineFactory (engineOptions) {
-   engineOptions = merge(engineOptions || {}, {
+   engineOptions = defaults(engineOptions || {}, {
       extension: '.jsx',
       babel: {},
       docType: '<!DOCTYPE html>',
       staticMarkup: false
    });
 
-   require('babel/register')(engineOptions.babel);
+   if (engineOptions.babel) {
+     require('babel/register')(engineOptions.babel);
+   }
 
    return function renderComponent (filename, options, callback) {
       options = options || {};

diff --git a/package.json b/package.json
@@ -20,8 +20,8 @@
     "react": "^0.13.1"
   },
   "dependencies": {
-    "lodash.merge": "^3.0.2",
-    "babel": "^4.7.16"
+    "babel": "^4.7.16",
+    "lodash.defaults": "^3.1.0"
   },
   "devDependencies": {
     "react": "^0.13.1"