Update

Author: tadatuta

.enb/make.js

@@ -7,17 +7,17 @@ var techs = {
         borschik: require('enb-borschik/techs/borschik'),
 
         // css
-        cssStylus: require('enb-stylus/techs/stylus'),
+        stylus: require('enb-stylus/techs/stylus'),
 
         // js
-        browserJs: require('enb-diverse-js/techs/browser-js'),
-        prependYm: require('enb-modules/techs/prepend-modules'),
+        browserJs: require('enb-js/techs/browser-js'),
 
         // bemtree
         bemtree: require('enb-bemxjst/techs/bemtree'),
 
         // bemhtml
-        bemhtml: require('enb-bemxjst/techs/bemhtml')
+        bemhtml: require('enb-bemxjst/techs/bemhtml'),
+        bemtreeToHtml: require('./techs/bemtree-to-html')
     },
     enbBemTechs = require('enb-bem-techs'),
     levels = [
@@ -43,20 +43,22 @@ module.exports = function(config) {
             [enbBemTechs.files],
 
             // css
-            [techs.cssStylus, {
+            [techs.stylus, {
                 target: '?.css',
+                sourcemap: !isProd,
                 autoprefixer: {
                     browsers: ['ie >= 10', 'last 2 versions', 'opera 12.1', '> 2%']
                 }
             }],
 
             // bemtree
-            [techs.bemtree, { devMode: process.env.BEMTREE_ENV === 'development' }],
+            [techs.bemtree, { sourceSuffixes: ['bemtree', 'bemtree.js'] }],
 
             // bemhtml
-            [techs.bemhtml, { devMode: process.env.BEMHTML_ENV === 'development' }],
+            [techs.bemhtml, { sourceSuffixes: ['bemhtml', 'bemhtml.js'] }],
 
-            [require('./techs/bemtree-to-html')],
+            // html
+            [techs.bemtreeToHtml],
 
             // client bemhtml
             [enbBemTechs.depsByTechToBemdecl, {
@@ -76,22 +78,21 @@ module.exports = function(config) {
             [techs.bemhtml, {
                 target: '?.browser.bemhtml.js',
                 filesTarget: '?.bemhtml.files',
-                devMode: process.env.BEMHTML_ENV === 'development'
+                sourceSuffixes: ['bemhtml', 'bemhtml.js']
             }],
 
             // js
-            [techs.browserJs],
+            [techs.browserJs, { includeYM: true }],
             [techs.fileMerge, {
-                target: '?.pre.js',
-                sources: ['?.browser.bemhtml.js', '?.browser.js']
+                target: '?.js',
+                sources: ['?.browser.js', '?.browser.bemhtml.js']
             }],
-            [techs.prependYm, { source: '?.pre.js' }],
 
             // borschik
-            [techs.borschik, { sourceTarget: '?.js', destTarget: '?.min.js', freeze: true, minify: isProd }],
-            [techs.borschik, { sourceTarget: '?.css', destTarget: '?.min.css', tech: 'cleancss', freeze: true, minify: isProd }]
+            [techs.borschik, { source: '?.js', target: '?.min.js', minify: isProd }],
+            [techs.borschik, { source: '?.css', target: '?.min.css', tech: 'cleancss', minify: isProd }]
         ]);
 
-        nodeConfig.addTargets(['?.bemtree.js', '?.html', '?.min.css', '?.min.js']);
+        nodeConfig.addTargets(['?.html', '?.min.css', '?.min.js']);
     });
 };

.enb/techs/bemtree-to-html.js

@@ -16,28 +16,20 @@
  * nodeConfig.addTech(require('enb/techs/html-from-bemjson'));
  * ```
  */
-var vow = require('vow'),
-    vfs = require('enb/lib/fs/async-fs'),
-    asyncRequire = require('enb/lib/fs/async-require'),
-    dropRequireCache = require('enb/lib/fs/drop-require-cache');
+var dropRequireCache = require('enb/lib/fs/drop-require-cache');
 
 module.exports = require('enb/lib/build-flow').create()
     .name('html-from-bemtree')
     .target('destTarget', '?.html')
     .useSourceFilename('bemtreeTarget', '?.bemtree.js')
     .useSourceFilename('bemhtmlTarget', '?.bemhtml.js')
     .builder(function(bemtreeFilename, bemhtmlFilename) {
+        dropRequireCache(require, bemtreeFilename);
         dropRequireCache(require, bemhtmlFilename);
 
-        return vow.all([
-                asyncRequire(bemtreeFilename),
-                asyncRequire(bemhtmlFilename)
-            ])
-            .spread(function(bemtree, bemhtml) {
-                return bemtree.BEMTREE.apply({ block: 'root' })
-                    .then(function(bemjson) {
-                        return bemhtml.BEMHTML.apply(bemjson);
-                    });
-            });
+        var BEMTREE = require(bemtreeFilename).BEMTREE,
+            BEMHTML = require(bemhtmlFilename).BEMHTML;
+
+        return BEMHTML.apply(BEMTREE.apply({ block: 'root' }));
     })
     .createTech();

.travis.yml

@@ -1,7 +1,6 @@
 language: node_js
 node_js:
-  - "0.11"
-  - "0.10"
+  - "0.12"
 
 script:
-  - "node_modules/.bin/bem make"
+  - "npm run make"

README.md

@@ -1,91 +1 @@
 # Stub to start a new [BEM](https://bem.info) project
-
-Project-stub is a template project repository used for BEM projects creation. It contains the minimal configuration files and folders you will need for quick start from scratch. 
-
-There are two main BEM libraries are linked here by default:
-
-* [bem-core](https://github.com/bem/bem-core)  
-* [bem-components](https://github.com/bem/bem-components)
-
-Just try and taste BEM!
-
-## Installation requirements
-
-- [Node.js](http://nodejs.org) is a platform built on Chrome's JavaScript runtime for easily building fast, scalable network applications.
-
-## Installation
-
-So, how easy is it to get started with BEM?  *Super easy*.
-
-It's as easy as...
-
-    git clone https://github.com/bem/project-stub.git -b bem-core my-bem-project
-    cd my-bem-project
-    npm install
-
-## Usage
-
-Now you can run any bem-tools commands from a `./node_modules/bem/bin/bem` directory.
-To be able to run bem-tools commands without typing a full path to an executable file (node_modules/bem/bin/bem), use bem-cli npm package: 
-
-`npm install -g bem-cli` or use an alternative method `export PATH=./node_modules/.bin:$PATH`
-
-**Start the server:**
-
-```bash
-bem server # bem server -p 8080 -v info|silly|debug|verbose|warn|error
-```
-
-> **hint:** execute the above commands in your terminal
-
-Now that `bem server ` is running, check it out:
-
-    navigate to: http://localhost:8080/desktop.bundles/index/index.html
-
-Stopping the server is also easy, pressing `Ctrl` + `C` while the terminal is your active window will stop the server.
-
-**Add block:**
-
-    bem create -l desktop.blocks -b newBlock
-
-**Add page:**
-
-    bem create -l desktop.bundles -b page
-
->  **hint:** you can add aliases for super easy use
-
-<pre><code class="lasso">echo "alias 'bemblock'='bem create -l desktop.blocks -b'" >> ~/.bashrc
-echo "alias 'bempage'='bem create -l desktop.bundles -b'" >> ~/.bashrc
-</code></pre>
-
-## Generator of BEM projects for Yeoman
-
-This generator provides you the ability to get the base of BEM project in few minutes by answering the simple questions.
-- [generator-bem-stub](https://en.bem.info/tools/bem/bem-stub/)
-
-## Docs
-
-- [Full stack quick start](https://en.bem.info/articles/start-with-project-stub/)
-- [Tutorial for BEMJSON template-engine](https://en.bem.info/technology/bemjson/current/bemjson/)
-- [Tutorial on BEMHTML](https://en.bem.info/libs/bem-core/2.0.0/bemhtml/reference/)
-- [Tutorial on i-bem.js](https://en.bem.info/tutorials/bem-js-tutorial/)
-- [JavaScript for BEM: main terms](https://en.bem.info/articles/bem-js-main-terms/)
-- [Commands bem-tools](https://en.bem.info/tools/bem/bem-tools/commands/)
-
-## Project-stub based projects
-
-- [Creating BEM application on Leaflet and 2GIS API](https://en.bem.info/tutorials/firm-card-story/)
-- [Creating a menu of geo objects collections with Yandex.Maps API and BEM](https://en.bem.info/tutorials/yamapsbem/)
-- [SSSR (Social Services Search Robot)](https://github.com/bem/sssr) — study app with BEM full-stack
-
-## Useful tools
-
-- [bem-cli](https://en.bem.info/blog/bem-cli/) — run bem-tools locally
-- [borschik](https://en.bem.info/tools/optimizers/borschik/) — borschik is a simple but powerful builder for text-based file formats
-
-## Videos
-- [BEM for JavaScript Talk on Camp JS](https://en.bem.info/talks/campjs-melbourne-2014/)
-
-## Working under Windows environment
-
-- [bemup-workshop-vagrant](https://github.com/dab/bemup-workshop-vagrant/blob/master/README.ru.md) — Provisions a clean VirtualBox Ubuntu server instance with all needed Node.js development tools