Merge pull request #267 from enb/bem-sdk.naming

Use bem-sdk.naming.*
enb · Oct 1, 2017 · 644e8d3 · 644e8d3
2 parents 49a9710 + 4e7fa17
commit 644e8d3
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 8 deletions.
diff --git a/lib/bundle-introspection.js b/lib/bundle-introspection.js
@@ -1,7 +1,8 @@
 'use strict';
 
-const stringifyEntity = require('bem-naming').stringify;
-const parseEntity = require('bem-naming').parse;
+const originNamingPreset = require('@bem/sdk.naming.presets').origin;
+const stringifyEntity = require('@bem/sdk.naming.entity.stringify')(originNamingPreset);
+const parseEntity = require('@bem/sdk.naming.entity.parse')(originNamingPreset);
 
 /**
  * Contains info about files in levels for bundle.

diff --git a/package.json b/package.json
@@ -45,9 +45,9 @@
   "dependencies": {
     "@bem/sdk.decl": "0.1.0",
     "@bem/sdk.deps": "0.1.0",
-    "@bem/sdk.naming.entity.stringify": "0.1.0",
-    "@bem/sdk.naming.presets": "0.1.0-alpha.21b40d0b",
-    "bem-naming": "1.0.1",
+    "@bem/sdk.naming.entity.stringify": "0.2.0",
+    "@bem/sdk.naming.entity.parse": "0.2.0",
+    "@bem/sdk.naming.presets": "0.0.3",
     "bem-walk": "1.0.0-1",
     "file-eval": "1.0.0",
     "inherit": "2.2.6",

diff --git a/techs/deps-by-tech-to-bemdecl.js b/techs/deps-by-tech-to-bemdecl.js
@@ -1,6 +1,7 @@
 var inherit = require('inherit'),
     vm = require('vm'),
-    naming = require('bem-naming'),
+    originNamingPreset = require('@bem/sdk.naming.presets').origin,
+    parseEntity = require('@bem/sdk.naming.entity.parse')(originNamingPreset),
     vow = require('vow'),
     enb = require('enb'),
     vfs = enb.asyncFS || require('enb/lib/fs/async-fs'),
@@ -96,7 +97,7 @@ module.exports = inherit(BaseTech, {
                         depResults.forEach(function (depResult) {
                             var fileDeps = vm.runInThisContext(depResult.text),
                                 bemname = depResult.file.name.split('.')[0],
-                                notation = naming.parse(bemname);
+                                notation = parseEntity(bemname);
 
                             if (!fileDeps) {
                                 return;

diff --git a/techs/levels.js b/techs/levels.js
@@ -7,7 +7,8 @@ const stream = require('stream');
 const vow = require('vow');
 const enb = require('enb');
 const walk = require('bem-walk');
-const stringifyEntity = require('bem-naming').stringify;
+const originNamingPreset = require('@bem/sdk.naming.presets').origin;
+const stringifyEntity = require('@bem/sdk.naming.entity.stringify')(originNamingPreset);
 const uniqBy = require('lodash').uniqBy;
 
 const vfs = enb.asyncFS || require('enb/lib/fs/async-fs');