template: proper eval (#55)

bem-site · May 10, 2016 · fceff6a · fceff6a
1 parent 1824b69
commit fceff6a
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/package.json b/package.json
@@ -67,6 +67,7 @@
     "js2xmlparser": "^1.0.0",
     "lodash": "^4.x",
     "marked": "^0.3.5",
+    "node-eval": "^1.0.0",
     "q": "^2.x",
     "rsync-slim": "^1.1.0"
   },

diff --git a/src/tasks/template/full-bem.js b/src/tasks/template/full-bem.js
@@ -1,9 +1,9 @@
-const vm = require('vm');
 const path = require('path');
 
 const _ = require('lodash');
 const Q = require('q');
 const freeze = require('freeze');
+const safeEval = require('node-eval');
 const baseUtil = require('../../util');
 
 const debug = require('debug')('full-bem');
@@ -115,9 +115,14 @@ module.exports = function(model, options) {
      * @returns {Object} page
      */
     function compoundPage(page, content) {
-        if(_.endsWith(page.contentFile, '.bemjson.js')) {
-            content = _bemhtml(vm.runInNewContext(content));
+        if(_.endsWith(page.contentFile, '.js')) {
+            content = safeEval(content, page.contentFile);
+
+            if(_.endsWith(page.contentFile, '.bemjson.js')) {
+                content = _bemhtml(content);
+            }
         }
+
         return _.set(page, 'content', content);
     }