Merge 4ae34e1 into cdd4963

app/config/versions.js

@@ -1,25 +1,25 @@
 module.exports = {
     libs: {
-        'bem-core': 'v2.8.0',
-        'bem-components': 'v2.3.0'
+        'bem-core': 'v2.9.1',
+        'bem-components': 'v2.5.1'
     },
     deps: {
         // enb
-        enb: '^0.17.2',
+        enb: '^1.1.2',
         'enb-autoprefixer': '^0.3.1',
-        'enb-bemxjst': '^2.0.2',
-        'enb-bem-techs': '^2.0.1',
-        'enb-bh': '^1.0.0',
-        'enb-borschik': '^2.0.0',
-        'enb-js': '^1.0.0',
+        'enb-bemxjst': '^6.2.0',
+        'enb-bem-techs': '^2.2.1',
+        'enb-bh': '^1.2.0',
+        'enb-borschik': '^2.4.0',
+        'enb-js': '^1.1.0',
         'enb-modules': '^0.2.0',
-        'enb-stylus': '^2.0.0',
+        'enb-stylus': '^2.3.2',
         'enb-beautify': '^0.0.3',
 
         // bem-tools
-        bem: '^0.10.1',
+        bem: '^0.10.2',
 
-        bower: '^1.5.3',
-        'borschik-tech-cleancss': '^2.0.1'
+        bower: '^1.7.7',
+        'borschik-tech-cleancss': '^2.1.0'
     }
 };

app/index.js

@@ -103,16 +103,6 @@ var BemGenerator = yeoman.generators.Base.extend({
             name: 'email',
             message: 'Enter an email of the project owner:',
             'default': this.user.git.email() || 'ivan@yandex.com'
-        }, {
-            type: 'list',
-            name: 'assembler',
-            message: 'Choose a toolkit to build the project:',
-            choices: [{
-                name: 'ENB',
-                value: 'enb'
-            }, {
-                value: 'bem-tools'
-            }]
         }, {
             type: 'checkbox',
             name: 'addLibraries',

app/templates/.enb/make.js

@@ -31,29 +31,20 @@ module.exports = function (config) {
             }]<% } %><% if (technologies.inTechs['bemtree']) { %>,
             // bemtree
             [require('enb-bemxjst/techs/bemtree'), {
-                devMode: process.env.BEMTREE_ENV === 'development',
-                compact: true
+                sourceSuffixes: ['bemtree', 'bemtree.js']
             }]<% } %><% if (technologies.inTechs['node.js']) { %>,
             // node.js
-            [require('enb-js/techs/node-js'), { target: '?.pre.node.js' }],
-            [require('enb-modules/techs/prepend-modules'), {
-                source: '?.pre.node.js',
-                target: '?.node.js'
-            }]<% } %><% if (technologies.inTechs['browser.js']) { %>,
+            [require('enb-js/techs/node-js'), { includeYM: true }]<% } %><% if (technologies.inTechs['browser.js']) { %>,
             // browser.js
-            [require('enb-js/techs/browser-js'), { target: '?.browser.js' }],
+            [require('enb-js/techs/browser-js'), { includeYM: true }],
             [require('enb/techs/file-merge'), {
-                target: '?.pre.js',
+                target: '?.js',
                 sources: ['?.browser.<%=technologies.inTechs["bemhtml"] ? "bemhtml" : "bh"%>.js', '?.browser.js']
-            }],
-            [require('enb-modules/techs/prepend-modules'), {
-                source: '?.pre.js',
-                target: '?.js'
-            }]<% } %><% if (technologies.inTechs['bemhtml']) { %>,
+            }]
+            <% } %><% if (technologies.inTechs['bemhtml']) { %>,
             // bemhtml
             [require('enb-bemxjst/techs/bemhtml'), {
-                devMode: process.env.BEMHTML_ENV === 'development',
-                compact: true
+                sourceSuffixes: ['bemhtml', 'bemhtml.js']
             }]<% } %><% if (technologies.inTechs['bemhtml'] && technologies.inTechs['browser.js']) { %>,
             // client bemhtml
             [enbBemTechs.depsByTechToBemdecl, {
@@ -73,8 +64,7 @@ module.exports = function (config) {
             [require('enb-bemxjst/techs/bemhtml'), {
                 target: '?.browser.bemhtml.js',
                 filesTarget: '?.bemhtml.files',
-                devMode: process.env.BEMHTML_ENV === 'development',
-                compact: true
+                sourceSuffixes: ['bemhtml', 'bemhtml.js']
             }]<% } %><% if (technologies.inTechs['bh']) { %>,
             // bh
             [require('enb-bh/techs/bh-commonjs'), {

app/templates/gitignore

@@ -4,4 +4,4 @@ libs/
 # bem
 .enb/tmp/
 *.bundles*/*/*.*
-<%= isBemjson ? '!*.bundles*/*/*.bemjson.js' : '!*.bundles*/*/*.bemdecl.js' %><%= assemblerName === 'bem-tools' ? '\n!*.bundles*/.bem/*' : '' %>
+!*.bundles*/*/*.bem<%= isBemjson ? 'json' : 'decl' %>.js

app/templates/package.json

@@ -1,23 +1,25 @@
 {
   "name": "<%= projectName %>",
   "description": "BEM project",
-  "version": "0.0.0",
+  "version": "1.0.0",
   "author": {
     "name": "<%= author %>",
     "email": "<%= email %>"
   },
   "repository": {},
   "engines": {
-    "node": ">=0.10.0"
+    "node": ">=4.0.0"
+  },
+  "dependencies": {
+    "bower": "^1.7.9"
   },
   "devDependencies": {
 <%= _.map(technologies.inJSON, function(technology) { return '    "' + technology.name + '": "' + technology.version + '"'}).join(',\n') %>
   },
   "scripts": {
     "start": "enb server",
     "postinstall": "npm run deps",
-    "deps": "bower install",
-    "postinstall": "npm run deps"
+    "deps": "bower i --allow-root"
   },
   "private": true
 }