Merge pull request bem-contrib#63 from bem-incubator/infrastructure

Build: upd packages, use magic, add tmpl-specs
tx44 · May 30, 2015 · 43860c7 · 43860c7
2 parents 85fe1aa + b051938
commit 43860c7
Show file tree

Hide file tree

Showing 3 changed files with 44 additions and 9 deletions.
diff --git a/.enb/make.js b/.enb/make.js
@@ -49,7 +49,7 @@ module.exports = function(config) {
             [techs.cssAutoprefixer, {
                 sourceTarget : '?.noprefix.css',
                 destTarget : '?.css',
-                browserSupport : ['last 2 versions', 'ie 10', 'opera 12.16']
+                browserSupport : ['last 2 versions', 'ie 10', 'opera 12.1']
             }],
 
             // bemtree
@@ -95,4 +95,37 @@ module.exports = function(config) {
 
         nodeConfig.addTargets(['?.html', '_?.css', '_?.js']);
     });
+
+    // tmpl specs
+    config.includeConfig('enb-bem-tmpl-specs');
+
+    configureSets(['desktop'], {
+        tmplSpecs : config.module('enb-bem-tmpl-specs').createConfigurator('tmpl-specs')
+    });
+
+    function configureSets(platforms, sets) {
+        platforms.forEach(function(platform) {
+            sets.tmplSpecs.configure({
+                destPath : platform + '.tmpl-specs',
+                levels : ['common.blocks', platform + '.blocks'],
+                sourceLevels : levels,
+                engines : {
+                    'bemhtml-dev' : {
+                        tech : 'enb-bemxjst/techs/bemhtml-old',
+                        options : {
+                            exportName : 'BEMHTML',
+                            devMode : true
+                        }
+                    },
+                    'bemhtml-prod' : {
+                        tech : 'enb-bemxjst/techs/bemhtml-old',
+                        options : {
+                            exportName : 'BEMHTML',
+                            devMode : false
+                        }
+                    }
+                }
+            });
+        });
+    }
 };
diff --git a/.gitignore b/.gitignore
@@ -10,4 +10,5 @@ npm-debug.log
 # bem
 .enb/tmp/
 *bundles*/*/*.*
-!*bundles*/*/*.bemjson.js
+!*bundles*/*/*.bemjson.js
+*.tmpl-specs/**
diff --git a/package.json b/package.json
@@ -15,19 +15,20 @@
     "node": ">=0.10"
   },
   "dependencies": {
-    "bem-environ": "^1.4.0",
-    "bower": "^1.3.12",
-    "bower-npm-install": "^0.5.9"
+    "bem-environ": "^1.4.0"
   },
   "devDependencies": {
     "borschik": "^1.3.2",
     "borschik-tech-cleancss": "^1.0.3",
-    "enb": "^0.13.15",
-    "enb-autoprefixer": "^0.2.2",
+    "bower": "^1.3.12",
+    "enb": "^0.15.0",
+    "enb-autoprefixer": "^0.3.0",
     "enb-bem-techs": "^1.0.3",
+    "enb-bem-tmpl-specs": "^0.11.1",
     "enb-bemxjst": "^1.3.4",
     "enb-borschik": "^1.4.0",
     "enb-diverse-js": "^0.1.0",
+    "enb-magic-platform": "^0.5.0",
     "enb-modules": "^0.2.0",
     "enb-stylus": "^1.2.0",
     "stylus": "^0.47.3",
@@ -39,8 +40,8 @@
     "jshint-groups": "0.6.0"
   },
   "scripts": {
-    "start": "enb server",
-    "deps": "bower-npm-install --non-interactive",
+    "start": "magic server",
+    "deps": "bower install --non-interactive",
     "lint": "jshint-groups && jscs . && csscomb -vl .",
     "compiled": "find . -iname '*.styl' | xargs stylus"
   },