From c078b544823cfd1e08133a1bb32115aea360b319 Mon Sep 17 00:00:00 2001 From: Anton Konev Date: Tue, 16 Jun 2015 22:09:11 +0500 Subject: [PATCH] Migrate to the bem-core library --- package.json | 2 +- server/package.json | 2 +- static/.enb/make.js | 7 +++---- static/bower.json | 4 ++-- static/package.json | 1 - 5 files changed, 7 insertions(+), 9 deletions(-) diff --git a/package.json b/package.json index 6fa10c3..9da2055 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "bemongo-stub", - "version": "0.0.1", + "version": "0.0.2", "description": "The test project on b_ with priv.js", "author": "@evilj0e", "email": "antonykonev@yandex.ru", diff --git a/server/package.json b/server/package.json index 132967b..8a066f1 100644 --- a/server/package.json +++ b/server/package.json @@ -1,6 +1,6 @@ { "name": "bemongo-stub", - "version": "0.0.1", + "version": "0.0.2", "description": "The test project on b_ with priv.js", "author": "@evilj0e", "email": "antonykonev@yandex.ru", diff --git a/static/.enb/make.js b/static/.enb/make.js index 5f689bf..d393b08 100755 --- a/static/.enb/make.js +++ b/static/.enb/make.js @@ -43,8 +43,8 @@ module.exports = function(config) { config.nodeMask(/desktop.bundles\/.*/, function(nodeConfig) { function getLevels() { return [ - {"path":"vendors/bem-bl/blocks-common","check":false}, - {"path":"vendors/bem-bl/blocks-desktop","check":false}, + {"path":"vendors/bem-core/common.blocks","check":false}, + {"path":"vendors/bem-core/desktop.blocks","check":false}, {"path":"vendors/bem-components/common.blocks","check":false}, {"path":"vendors/bem-components/desktop.blocks","check":false}, @@ -58,7 +58,6 @@ module.exports = function(config) { [ require("enb/techs/file-provider"), { target: "?.bemdecl.js" } ], require("enb/techs/deps-old"), require("enb/techs/files"), - [ require('enb-xjst/techs/bemhtml'), { devMode: false } ], [ require("./enb/techs/priv-i18n"), { lang: "{lang}" } ], [ require("enb/techs/i18n-merge-keysets"), { lang: "all" }], [ require("enb/techs/i18n-merge-keysets"), { lang: "{lang}" }], @@ -72,6 +71,6 @@ module.exports = function(config) { [ require("enb/techs/css-ie8"), { sourceSuffixes: ['css', 'ie.css', 'ie8.css'] }], [ require("enb/techs/css-ie9"), { sourceSuffixes: ['css', 'ie9.css'] }] ]); - nodeConfig.addTargets(["_?.{lang}.js", "?.priv.js", "?.priv.{lang}.js", "?.bemhtml.js", "_?.css", "_?.ie6.css", "_?.ie7.css", "_?.ie8.css", "_?.ie9.css"]); + nodeConfig.addTargets(["_?.{lang}.js", "?.priv.js", "?.priv.{lang}.js", "_?.css", "_?.ie6.css", "_?.ie7.css", "_?.ie8.css", "_?.ie9.css"]); }); }; diff --git a/static/bower.json b/static/bower.json index bf9d4cd..73a41ca 100755 --- a/static/bower.json +++ b/static/bower.json @@ -1,6 +1,6 @@ { "name": "static", - "version": "0.0.1", + "version": "0.0.2", "ignore": [ "**/.*", "node_modules", @@ -10,7 +10,7 @@ "tests" ], "dependencies": { - "bem-bl": "git://github.com/bem/bem-bl.git", + "bem-core": "git://github.com/bem/bem-core.git", "bem-components": "git://github.com/bem/bem-components.git" } } diff --git a/static/package.json b/static/package.json index 71c0bec..d366732 100755 --- a/static/package.json +++ b/static/package.json @@ -4,7 +4,6 @@ "author": "Anton Konev ", "dependencies": { "enb": "~0.15.0", - "enb-xjst": "~1.2.0", "bower": "~1.4.1", "vow": "~0.4.9", "vow-fs": "~0.3.4"