diff --git a/.enb/make.js b/.enb/make.js index 7160d6c..8ca80f1 100644 --- a/.enb/make.js +++ b/.enb/make.js @@ -9,7 +9,7 @@ var path = require('path'), bemhtml : require('enb-bemxjst/techs/bemhtml'), borschik : require('enb-borschik/techs/borschik'), html : require('enb-bemxjst/techs/bemjson-to-html'), - grid : require('../engines/enb-grid/techs/enb-grid') + grid : require('../engines/enb-bem-grid/techs/enb-bem-grid') }; module.exports = function(config) { diff --git a/.gitignore b/.gitignore index 68e047d..c33990c 100644 --- a/.gitignore +++ b/.gitignore @@ -22,9 +22,9 @@ libs /coverage.json /gemini-report/ -/engines/enb-grid/techs/.enb/tmp -/engines/enb-grid/techs/build/build.deps.js -/engines/enb-grid/techs/build/build.css +/engines/enb-bem-grid/techs/.enb/tmp +/engines/enb-bem-grid/techs/build/build.deps.js +/engines/enb-bem-grid/techs/build/build.css /dist/dist.css /dist/dist.tmp.css /dist/dist.tmp.grid.css diff --git a/README.md b/README.md index c97f07b..b43eb20 100644 --- a/README.md +++ b/README.md @@ -15,7 +15,7 @@ Like Twitter Bootstrap: As [ENB](https://github.com/enb-make/enb) module: -1. `npm i --save-dev bem-grid` +1. `npm i --save-dev enb-bem-grid` 2. Add `enb-grid` after any css builder ``` js [require('enb-grid'), { diff --git a/engines/enb-grid/techs/.enb/make.js b/engines/enb-grid/techs/.enb/make.js deleted file mode 100644 index 2556522..0000000 --- a/engines/enb-grid/techs/.enb/make.js +++ /dev/null @@ -1,35 +0,0 @@ -var path = require('path'), - techs = { - levels : require('enb-bem-techs/techs/levels'), - provide : require('enb/techs/file-provider'), - deps : require('enb-bem-techs/techs/deps-old'), - files : require('enb-bem-techs/techs/files'), - postcss : require('enb-postcss/techs/enb-postcss') - }; - -module.exports = function (grid, browsers) { - return function(config) { - config.node('build/', function(nodeConfig) { - nodeConfig.addTechs([ - [techs.levels, { - levels : [ - { path : '../../../common.blocks' } - ] - }], - [techs.provide, { target : '?.bemdecl.js' }], - [techs.deps], - [techs.files], - [techs.postcss, { - plugins : require('../../../../.enb/postcss-plugins')({ - grid : grid, - browsers : browsers - }) - }] - ]); - - nodeConfig.addTargets([ - '?.css' - ]); - }); - }; -}; diff --git a/engines/enb-grid/techs/build/build.bemdecl.js b/engines/enb-grid/techs/build/build.bemdecl.js deleted file mode 100644 index 6fc528a..0000000 --- a/engines/enb-grid/techs/build/build.bemdecl.js +++ /dev/null @@ -1,8 +0,0 @@ -exports.blocks = [ - { - "name" : "mq" - }, - { - "name" : "row" - } -]; diff --git a/engines/enb-grid/techs/enb-grid.js b/engines/enb-grid/techs/enb-grid.js deleted file mode 100644 index 8043b73..0000000 --- a/engines/enb-grid/techs/enb-grid.js +++ /dev/null @@ -1,34 +0,0 @@ -var vowFs = require('enb/lib/fs/async-fs'), - make = require('enb/lib/api/make'), - path = require('path'), - exec = require('child_process').exec; - -module.exports = require('enb/lib/build-flow').create() - .name('enb-grid') - .target('target', '?.css') - .defineOption('config') - .defineOption('browsers') - .defineOption('source') - .useSourceText('source', '?') - .builder(function(preTargetSource) { - var _this = this, - prefixedConfig = {}; - Object.keys(_this._config).forEach(function(key) { - prefixedConfig['grid' + capitalize(key)] = _this._config[key]; - }); - - return make([], { - dir : __dirname, - config : require('./.enb/make.js')(prefixedConfig, this._browsers) - }).then(function() { - return vowFs.read(path.join(__dirname, 'build', 'build.css'), 'utf8') - .then(function(gridRes) { - return gridRes + preTargetSource; - }); - }); - }) - .createTech(); - -function capitalize(s) { - return s[0].toUpperCase() + s.slice(1); -}