Migration to bem-xjst 8 (#2)

* Migration to bem-xjst 8 * Rename *.bemhtml to *.bemhtml.js
bem-contrib · Aug 9, 2018 · e121f14 · e121f14
1 parent 4afefcb
commit e121f14
Show file tree

Hide file tree

Showing 9 changed files with 15 additions and 9 deletions.
diff --git a/.enb/make.js b/.enb/make.js
@@ -59,7 +59,7 @@ function createTestsNodes(config) {
                 [bemhtml, {
                     target : '?.browser.tmpl.js',
                     filesTarget : '?.tmpl.files',
-                    sourceSuffixes : ['bemhtml', 'bemhtml.js']
+                    sourceSuffixes : ['bemhtml.js']
                 }] :
                 [bhBundle, {
                     target : '?.browser.tmpl.js',
@@ -107,7 +107,12 @@ function createTmplTestsNodes(config) {
             },
             bemhtml : {
                 tech : 'enb-bemxjst/techs/bemhtml',
-                options : { sourceSuffixes : ['bemhtml', 'bemhtml.js'] }
+                options : {
+                    sourceSuffixes : ['bemhtml.js'],
+                    engineOptions : {
+                        xhtml : true
+                    }
+                }
             }
         }
     });

diff --git a/blocks/sg-datalist/sg-datalist.bemhtml → blocks/sg-datalist/sg-datalist.bemhtml.js b/blocks/sg-datalist/sg-datalist.bemhtml → blocks/sg-datalist/sg-datalist.bemhtml.js
diff --git a/...uggest/__control/suggest__control.bemhtml → ...est/__control/suggest__control.bemhtml.js b/...uggest/__control/suggest__control.bemhtml → ...est/__control/suggest__control.bemhtml.js
diff --git a/...gest/__datalist/suggest__datalist.bemhtml → ...t/__datalist/suggest__datalist.bemhtml.js b/...gest/__datalist/suggest__datalist.bemhtml → ...t/__datalist/suggest__datalist.bemhtml.js
diff --git a/blocks/suggest/_has-dataprovider/suggest_has-dataprovider.bemhtml b/blocks/suggest/_has-dataprovider/suggest_has-dataprovider.bemhtml
diff --git a/blocks/suggest/_has-dataprovider/suggest_has-dataprovider.bemhtml.js b/blocks/suggest/_has-dataprovider/suggest_has-dataprovider.bemhtml.js
@@ -0,0 +1,4 @@
+block('suggest').match(function() { return this.mods['has-dataprovider']; }).js()(function() {
+    var prevJs = applyNext();
+    return prevJs && prevJs !== true? this.extend(prevJs, this.ctx.dataprovider) : this.ctx.dataprovider;
+})
diff --git a/blocks/suggest/suggest.bemhtml → blocks/suggest/suggest.bemhtml.js b/blocks/suggest/suggest.bemhtml → blocks/suggest/suggest.bemhtml.js
diff --git a/bower.json b/bower.json
@@ -6,9 +6,9 @@
     "Vladimir Varankin <[email protected]> (http://github.com/narqo)"
   ],
   "dependencies": {
-    "bem-components": "^5.0.0"
+    "bem-components": "^6.0.1"
   },
   "devDependencies": {
-    "bem-pr": "~0.10.0"
+    "bem-pr": "~0.15.0"
   }
 }
diff --git a/package.json b/package.json
@@ -16,8 +16,8 @@
     "bower": "^1.7.7",
     "enb": "^1.1.2",
     "enb-bem-techs": "^2.2.1",
-    "enb-bem-tmpl-specs": "^0.16.1",
-    "enb-bemxjst": "^4.1.0",
+    "enb-bem-tmpl-specs": "^1.3.3",
+    "enb-bemxjst": "^8.10.4",
     "enb-bh": "^1.1.0",
     "enb-borschik": "^2.3.0",
     "enb-js": "^1.1.0",