#329 Use bemhtml from bem-xjst

bem · Dec 19, 2013 · 07472bb · 07472bb
1 parent 9a66b94
commit 07472bb
Show file tree

Hide file tree

Showing 9 changed files with 20 additions and 119 deletions.
diff --git a/.bem/lib/bemhtml.js b/.bem/lib/bemhtml.js
diff --git a/.bem/lib/bemhtml/api.js b/.bem/lib/bemhtml/api.js
diff --git a/.bem/lib/bemhtml/cache.js b/.bem/lib/bemhtml/cache.js
diff --git a/.bem/techs/bemhtml.js b/.bem/techs/bemhtml.js
@@ -38,12 +38,20 @@ exports.techMixin = {
     getCompiledResult : function(sources) {
         sources = sources.join('\n');
 
-        var BEMHTML = require('../lib/bemhtml');
-        return BEMHTML.translate(sources, {
-                devMode : process.env.BEMHTML_ENV == 'development',
-                cache   : process.env.BEMHTML_CACHE == 'on',
-                exportName : 'BEMHTML'
-            });
+        var BEMHTML = require('bem-xjst/lib/bemhtml'),
+            exportName = this.getExportName(),
+            optimize = process.env[exportName + '_ENV'] != 'development';
+
+        return BEMHTML.generate(sources, {
+            wrap: true,
+            exportName: exportName,
+            optimize: optimize,
+            cache   : optimize && process.env[exportName + '_CACHE'] == 'on'
+        });
+    },
+
+    getExportName: function() {
+        return 'BEMHTML';
     }
 
 };
diff --git a/.bem/techs/bemtree.js b/.bem/techs/bemtree.js
@@ -12,14 +12,8 @@ exports.techMixin = {
         return ['bemtree'];
     },
 
-    getCompiledResult : function(sources) {
-        sources = sources.join('\n');
-
-        var BEMHTML = require('../lib/bemhtml');
-        return BEMHTML.translate(sources, {
-                devMode : process.env.BEMTREE_ENV == 'development',
-                exportName : 'BEMTREE'
-            });
+    getExportName: function() {
+        return 'BEMTREE';
     }
 
 };
diff --git a/common.blocks/i-bem/__i18n/i-bem__i18n.test.bemhtml/i-bem__i18n-test.js b/common.blocks/i-bem/__i18n/i-bem__i18n.test.bemhtml/i-bem__i18n-test.js
@@ -4,7 +4,7 @@
 var ASSERT = require('assert'),
     FS = require('fs'),
     PATH = require('path'),
-    BEMHTML = require('../../../../.bem/lib/bemhtml'),
+    BEMHTML = require('bem-xjst/lib/bemhtml'),
     resolve = PATH.resolve.bind(null, __dirname),
     cores = [
             '../_dummy/i-bem__i18n_dummy_yes.bemhtml',

diff --git a/common.blocks/i-bem/i-bem.test.bemhtml/basic-test.js b/common.blocks/i-bem/i-bem.test.bemhtml/basic-test.js
@@ -1,5 +1,5 @@
 var assert = require('assert'),
-    bemhtml = require('../../../.bem/lib/bemhtml');
+    bemhtml = require('bem-xjst/lib/bemhtml');
 
 suite('BEMHTML Compiler', function() {
   function unit(name, src, data, dst) {

diff --git a/common.blocks/i-bem/i-bem.test.bemhtml/i-bem-test.js b/common.blocks/i-bem/i-bem.test.bemhtml/i-bem-test.js
@@ -1,7 +1,7 @@
 var assert = require('assert'),
     fs = require('fs'),
     path = require('path'),
-    bemhtml = require('../../../.bem/lib/bemhtml'),
+    bemhtml = require('bem-xjst/lib/bemhtml'),
     iBem = fs.readFileSync(path.resolve(
       __dirname,
       '../i-bem.bemhtml'

diff --git a/package.json b/package.json
@@ -15,7 +15,7 @@
   "license": "MIT",
   "dependencies": {
     "ym": "0.0.12",
-    "bem-xjst": "~0.3.1",
+    "bem-xjst": "0.4.0",
     "bemhtml-compat": "~0.0.4",
     "bem-environ": "~1.2.0"
   },