From 8966d668f1aa7393402075b0dc0cb43d45dd447a Mon Sep 17 00:00:00 2001 From: Evgeniy Baranov Date: Thu, 17 Dec 2015 23:01:35 +0300 Subject: [PATCH 1/3] =?UTF-8?q?=D0=9E=D0=B1=D0=BD=D0=BE=D0=B2=D0=BB=D0=B5?= =?UTF-8?q?=D0=BD=D0=B8=D0=B5=20=D0=B7=D0=B0=D0=B2=D0=B8=D1=81=D0=B8=D0=BC?= =?UTF-8?q?=D0=BE=D1=81=D1=82=D0=B5=D0=B9=20=D0=BD=D0=B0=20=D0=B0=D0=BA?= =?UTF-8?q?=D1=82=D1=83=D0=B0=D0=BB=D1=8C=D0=BD=D1=8B=D0=B5=20=D0=B2=D0=B5?= =?UTF-8?q?=D1=80=D1=81=D0=B8=D0=B8.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bower.json | 6 ++++-- package.json | 13 +++++++------ 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/bower.json b/bower.json index edf5d6e..950a9f4 100644 --- a/bower.json +++ b/bower.json @@ -15,7 +15,9 @@ "libs" ], "dependencies": { - "bem-components": "git://github.com/bem/bem-components.git#v2", - "bem-pr": "~0.5.0" + "bem-components": "2.3.0" + }, + "devDependencies": { + "bem-pr": "~0.12.0" } } diff --git a/package.json b/package.json index c1899f7..357534c 100644 --- a/package.json +++ b/package.json @@ -15,13 +15,14 @@ "bem-environ": "~1.4.0" }, "devDependencies": { - "bem": "~0.8.0", - "bower-npm-install": "~0.5.4", - "enb-bem-docs": "git://github.com/andrewblond/enb-bem-docs.git#6b1544a8f3e516eaee3303cf84131e773868eb2b", - "enb": "0.10.0", + "bem": "~0.10.0", + "bower-npm-install": "~0.5.10", + "enb": "0.17.0", + "enb-bem-techs": "2.0.0", + "enb-bem-docs": "^0.11.0", "enb-diverse-js": "0.1.0", - "enb-modules": "0.1.1", - "enb-bemxjst": "1.1.1", + "enb-modules": "~0.2.0", + "enb-bemxjst": "v2.0.0-rc", "enb-roole": "0.2.1", "enb-autoprefixer": "0.1.0", "bem-tools-autoprefixer": "0.0.3", From d07727a7c097d86f579497974891f47c91f09307 Mon Sep 17 00:00:00 2001 From: Evgeniy Baranov Date: Thu, 17 Dec 2015 23:02:21 +0300 Subject: [PATCH 2/3] =?UTF-8?q?=D0=9D=D0=B0=D1=81=D1=82=D1=80=D0=BE=D0=B5?= =?UTF-8?q?=D1=80=D0=B0=20=D1=81=D0=B1=D0=BE=D1=80=D0=BA=D0=B0=20=D0=BD?= =?UTF-8?q?=D0=B0=20=D0=BE=D0=B1=D0=BD=D0=BE=D0=B2=D0=BB=D0=B5=D0=BD=D0=BD?= =?UTF-8?q?=D1=8B=D1=85=20=D0=BF=D0=B0=D0=BA=D0=B5=D1=82=D0=B0=D1=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .enb/make.js | 33 ++++++++++++++++++--------------- 1 file changed, 18 insertions(+), 15 deletions(-) diff --git a/.enb/make.js b/.enb/make.js index 3a1602d..70dec49 100644 --- a/.enb/make.js +++ b/.enb/make.js @@ -1,9 +1,14 @@ var fs = require('fs'), path = require('path'), + enbBemTechs = require('enb-bem-techs'), + bemhtml = require('enb-bemxjst/techs/bemhtml'), + bemjsonToHtml = require('enb-bemxjst/techs/bemjson-to-html'), DEFAULT_LANGS = ['ru', 'en']; module.exports = function(config) { - var tools = require('enb-bem-docs')(config), + config.includeConfig('enb-bem-docs'); + + var tools = config.module('enb-bem-docs').createConfigurator('docs'), langs = process.env.BEM_I18N_LANGS; config.setLanguages(langs? langs.split(' ') : [].concat(DEFAULT_LANGS)); @@ -11,14 +16,14 @@ module.exports = function(config) { config.nodes(['*.bundles/all-tests', '*.bundles/todos'], function(nodeConfig) { nodeConfig.addTechs([ [require('enb/techs/file-provider'), { target : '?.bemjson.js' }], - [require('enb/techs/bemdecl-from-bemjson')], + [enbBemTechs.bemjsonToBemdecl], [require('enb/techs/bemdecl-from-deps-by-tech'), { sourceTech : 'js', destTech : 'bemhtml', target : '?.bemhtml.bemdecl.js' }], - [require('enb/techs/deps')], - [require('enb/techs/files')], + [enbBemTechs.deps], + [enbBemTechs.files], [require('enb/techs/deps'), { bemdeclTarget : '?.bemhtml.bemdecl.js', depsTarget : '?.bemhtml.deps.js' @@ -30,8 +35,7 @@ module.exports = function(config) { }], [require('enb-roole/techs/css-roole'), { target : '?.noprefix.css' }], [require('enb-diverse-js/techs/browser-js')], - [require('enb-bemxjst/techs/bemhtml-old'), { devMode : false }], - [require('enb-bemxjst/techs/bemhtml-old'), { + [require('enb-bemxjst/techs/bemhtml'), { target : '?.browser.bemhtml.js', filesTraget : '?.bemhtml.files', devMode : false @@ -44,7 +48,8 @@ module.exports = function(config) { source : '?.pre.js', target : '?.js' }], - [require('enb/techs/html-from-bemjson')] + [bemhtml, { devMode: process.env.BEMHTML_ENV === 'development' }], + [bemjsonToHtml], ]); nodeConfig.addTargets([ @@ -61,7 +66,7 @@ module.exports = function(config) { } nodeConfig.addTechs([ - [require('enb/techs/levels'), { levels : levels }], + [enbBemTechs.levels, { levels : levels }], [require('enb-autoprefixer/techs/css-autoprefixer'), { sourceTarget : '?.noprefix.css', destTarget : '?.css', @@ -88,13 +93,11 @@ module.exports = function(config) { }); }); - tools.configureSets({ - sets : { - destPath : 'desktop.sets', - levels : getDesktopLibLevels(config) - }, - jsdocs : { - _suffixes : ['vanilla.js', 'node.js', 'browser.js', 'js'] + tools.configure({ + destPath : 'desktop.sets', + levels : getDesktopLibLevels(config), + jsdoc : { + suffixes : ['vanilla.js', 'node.js', 'browser.js', 'js'] }, examples : { levels : getDesktopLibLevels(config), From e54dbb8e97aa21e65f8fc7a57599cb617da0852e Mon Sep 17 00:00:00 2001 From: Evgeniy Baranov Date: Fri, 18 Dec 2015 07:52:48 +0300 Subject: [PATCH 3/3] bem-compponents 2.4 --- bower.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bower.json b/bower.json index 950a9f4..13d5232 100644 --- a/bower.json +++ b/bower.json @@ -15,7 +15,7 @@ "libs" ], "dependencies": { - "bem-components": "2.3.0" + "bem-components": "~2.4.0" }, "devDependencies": { "bem-pr": "~0.12.0"