From 290431eaaf6370c305c68e2c5797376ed4fce153 Mon Sep 17 00:00:00 2001 From: Vladimir Grinenko Date: Fri, 22 Apr 2016 00:40:27 +0300 Subject: [PATCH] Update enb-bem-examples --- .enb/make.js | 21 +++++++++------------ package.json | 2 +- 2 files changed, 10 insertions(+), 13 deletions(-) diff --git a/.enb/make.js b/.enb/make.js index 98a240ad1..6f8493255 100644 --- a/.enb/make.js +++ b/.enb/make.js @@ -343,18 +343,15 @@ module.exports = function(config) { function configureLevels(platform, nodes) { config.nodes(nodes, function(nodeConfig) { - var nodeDir = nodeConfig.getNodePath(), - blockSublevelDir = path.join(nodeDir, '..', '.blocks'), - sublevelDir = path.join(nodeDir, 'blocks'), - extendedLevels = [].concat(getTestLevels(platform)); - - if(fs.existsSync(blockSublevelDir)) { - extendedLevels.push(blockSublevelDir); - } - - if(fs.existsSync(sublevelDir)) { - extendedLevels.push(sublevelDir); - } + var nodeDirname = nodeConfig.getNodePath(), + blockName = path.basename(path.dirname(nodeDirname)), + exampleName = path.basename(nodeDirname), + extendedLevels = [].concat( + getTestLevels(platform), + path.join(nodeDirname, blockName + '.blocks'), + path.join(nodeDirname, exampleName + '.blocks'), + path.join(nodeDir, 'blocks') + ).filter(fs.existsSync); nodeConfig.addTech([techs.bem.levels, { levels : extendedLevels }]); }); diff --git a/package.json b/package.json index 0b25d7658..774812357 100644 --- a/package.json +++ b/package.json @@ -23,7 +23,7 @@ "csscomb": "^3.1.8", "enb": "^1.2.0", "enb-bem-docs": "^0.11.0", - "enb-bem-examples": "^0.6.0", + "enb-bem-examples": "^1.0.1", "enb-bem-specs": "^0.9.0", "enb-bem-techs": "^2.2.1", "enb-bem-tmpl-specs": "^1.2.0",