Merge 1d524e6 into c6ce4e9

enb · Oct 11, 2016 · b82b4cc · b82b4cc
2 parents c6ce4e9 + 1d524e6
commit b82b4cc
Show file tree

Hide file tree

Showing 24 changed files with 41 additions and 103 deletions.
diff --git a/package.json b/package.json
@@ -43,28 +43,24 @@
     "enb": ">=0.15.0 <2.0.0"
   },
   "dependencies": {
-    "bem-naming": "1.0.1",
-    "bem-walk": "1.0.0-1",
     "@bem/deps": "0.2.2",
     "bem-decl": "0.3.0",
-    "clear-require": "1.0.1",
-    "enb-async-require": "1.0.1",
-    "enb-require-or-eval": "1.0.2",
+    "bem-naming": "1.0.1",
+    "bem-walk": "1.0.0-1",
+    "file-eval": "1.0.0",
     "inherit": "2.2.3",
     "lodash": "4.11.1",
     "vow": "0.4.12"
   },
   "devDependencies": {
     "enb": ">=0.15.0 <2.0.0",
-    "gulp-eval": "1.0.0-0",
     "istanbul": "0.4.2",
     "jscs": "2.8.0",
     "jshint": "2.9.1",
     "mocha": "2.3.4",
     "mock-enb": "0.3.2",
     "mock-fs": "3.8.0",
-    "must": "0.13.1",
-    "proxyquire": "1.7.4"
+    "must": "0.13.1"
   },
   "main": "index.js",
   "files": [

diff --git a/techs/bemjson-to-bemdecl.js b/techs/bemjson-to-bemdecl.js
@@ -2,9 +2,7 @@ var inherit = require('inherit'),
     enb = require('enb'),
     vfs = enb.asyncFS || require('enb/lib/fs/async-fs'),
     BaseTech = enb.BaseTech || require('enb/lib/tech/base-tech'),
-    requireOrEval = require('enb-require-or-eval'),
-    asyncRequire = require('enb-async-require'),
-    clearRequire = require('clear-require'),
+    fileEval = require('file-eval'),
     deps = require('../lib/deps/deps');
 
 /**
@@ -64,7 +62,7 @@ module.exports = inherit(BaseTech, {
                 if (cache.needRebuildFile('bemdecl-file', bemdeclFilename) ||
                     cache.needRebuildFile('bemjson-file', bemjsonFilename)
                 ) {
-                    return requireOrEval(bemjsonFilename)
+                    return fileEval(bemjsonFilename)
                         .then(function (bemjson) {
                             var bemjsonDeps = getDepsFromBemjson(bemjson),
                                 decl,
@@ -90,9 +88,8 @@ module.exports = inherit(BaseTech, {
                         });
                 } else {
                     node.isValidTarget(target);
-                    clearRequire(bemdeclFilename);
 
-                    return asyncRequire(bemdeclFilename)
+                    return fileEval(bemdeclFilename)
                         .then(function (result) {
                             node.resolveTarget(target, result);
                             return null;

diff --git a/techs/deps-by-tech-to-bemdecl.js b/techs/deps-by-tech-to-bemdecl.js
@@ -5,8 +5,7 @@ var inherit = require('inherit'),
     enb = require('enb'),
     vfs = enb.asyncFS || require('enb/lib/fs/async-fs'),
     BaseTech = enb.BaseTech || require('enb/lib/tech/base-tech'),
-    asyncRequire = require('enb-async-require'),
-    clearRequire = require('clear-require'),
+    fileEval = require('file-eval'),
     deps = require('../lib/deps/deps');
 
 /**
@@ -163,9 +162,8 @@ module.exports = inherit(BaseTech, {
                     });
                 } else {
                     node.isValidTarget(target);
-                    clearRequire(bemdeclFilename);
 
-                    return asyncRequire(bemdeclFilename)
+                    return fileEval(bemdeclFilename)
                         .then(function (result) {
                             node.resolveTarget(target, result);
                             return null;

diff --git a/techs/deps.js b/techs/deps.js
@@ -1,8 +1,7 @@
 var inherit = require('inherit'),
     vow = require('vow'),
     enb = require('enb'),
-    asyncRequire = require('enb-async-require'),
-    clearRequire = require('clear-require'),
+    fileEval = require('file-eval'),
     bemDeps = require('@bem/deps'),
     bemDecl = require('bem-decl'),
     vfs = enb.asyncFs || require('enb/lib/fs/async-fs'),
@@ -94,9 +93,8 @@ module.exports = inherit(BaseTech, {
                         });
                 } else {
                     node.isValidTarget(target);
-                    clearRequire(targetFilename);
 
-                    return asyncRequire(targetFilename)
+                    return fileEval(targetFilename)
                         .then(function (result) {
                             node.resolveTarget(target, result);
                             return null;
@@ -125,10 +123,7 @@ function convertEntity(obj) {
 }
 
 function requireSourceDeps(data, filename) {
-    return (data ? vow.resolve(data) : (
-            clearRequire(filename),
-            asyncRequire(filename)
-        ))
+    return (data ? vow.resolve(data) : fileEval(filename))
         .then(function (sourceDeps) {
             // todo:добавить параметр с версией декларации
             if (sourceDeps.deps) {

diff --git a/techs/files.js b/techs/files.js
@@ -4,8 +4,7 @@ var fs = require('fs'),
     inherit = require('inherit'),
     vow = require('vow'),
     enb = require('enb'),
-    asyncRequire = require('enb-async-require'),
-    clearRequire = require('clear-require'),
+    fileEval = require('file-eval'),
     stringifyEntity = require('bem-naming').stringify,
 
     deps = require('../lib/deps/deps'),
@@ -176,10 +175,7 @@ function getFileInfo(file) {
 }
 
 function requireSourceDeps(data, filename) {
-    return (data ? vow.resolve(data) : (
-            clearRequire(filename),
-            asyncRequire(filename)
-        ))
+    return (data ? vow.resolve(data) : fileEval(filename))
         .then(function (sourceDeps) {
             if (sourceDeps.blocks) {
                 return deps.fromBemdecl(sourceDeps.blocks);

diff --git a/techs/levels-to-bemdecl.js b/techs/levels-to-bemdecl.js
@@ -1,7 +1,6 @@
 var inherit = require('inherit'),
     enb = require('enb'),
-    asyncRequire = require('enb-async-require'),
-    clearRequire = require('clear-require'),
+    fileEval = require('file-eval'),
 
     vfs = enb.asyncFS || require('enb/lib/fs/async-fs'),
     BaseTech = enb.BaseTech || require('enb/lib/tech/base-tech'),
@@ -91,9 +90,8 @@ module.exports = inherit(BaseTech, {
                     });
             } else {
                 node.isValidTarget(target);
-                clearRequire(bemdeclFilename);
 
-                return asyncRequire(bemdeclFilename)
+                return fileEval(bemdeclFilename)
                     .then(function (result) {
                         node.resolveTarget(target, result);
                         return null;

diff --git a/techs/merge-bemdecl.js b/techs/merge-bemdecl.js
@@ -1,10 +1,10 @@
 var inherit = require('inherit'),
     vow = require('vow'),
     enb = require('enb'),
+    fileEval = require('file-eval'),
+
     vfs = enb.asyncFS || require('enb/lib/fs/async-fs'),
     BaseTech = enb.BaseTech || require('enb/lib/tech/base-tech'),
-    asyncRequire = require('enb-async-require'),
-    clearRequire = require('clear-require'),
     deps = require('../lib/deps/deps');
 
 /**
@@ -89,8 +89,7 @@ module.exports = inherit(BaseTech, {
 
                             var filename = sourceFilenames[i];
 
-                            clearRequire(filename);
-                            return asyncRequire(filename)
+                            return fileEval(filename)
                                 .then(function (result) {
                                     return deps.fromBemdecl(result.blocks);
                                 });
@@ -111,9 +110,8 @@ module.exports = inherit(BaseTech, {
                         });
                 } else {
                     node.isValidTarget(target);
-                    clearRequire(targetFilename);
 
-                    return asyncRequire(targetFilename)
+                    return fileEval(targetFilename)
                         .then(function (result) {
                             node.resolveTarget(target, result);
                             return null;

diff --git a/techs/merge-deps.js b/techs/merge-deps.js
@@ -3,8 +3,7 @@ var inherit = require('inherit'),
     enb = require('enb'),
     vfs = enb.asyncFS || require('enb/lib/fs/async-fs'),
     BaseTech = enb.BaseTech || require('enb/lib/tech/base-tech'),
-    asyncRequire = require('enb-async-require'),
-    clearRequire = require('clear-require'),
+    fileEval = require('file-eval'),
     deps = require('../lib/deps/deps');
 
 /**
@@ -93,8 +92,7 @@ module.exports = inherit(BaseTech, {
 
                             var filename = sourceFilenames[i];
 
-                            clearRequire(filename);
-                            return asyncRequire(filename)
+                            return fileEval(filename)
                                 .then(function (res) {
                                     return getDeps(res);
                                 });
@@ -114,9 +112,8 @@ module.exports = inherit(BaseTech, {
                         });
                 } else {
                     node.isValidTarget(target);
-                    clearRequire(targetFilename);
 
-                    return asyncRequire(targetFilename)
+                    return fileEval(targetFilename)
                         .then(function (result) {
                             node.resolveTarget(target, result);
                             return null;

diff --git a/techs/provide-bemdecl.js b/techs/provide-bemdecl.js
@@ -3,8 +3,7 @@ var inherit = require('inherit'),
     enb = require('enb'),
     vfs = enb.asyncFS || require('enb/lib/fs/async-fs'),
     BaseTech = enb.BaseTech || require('enb/lib/tech/base-tech'),
-    asyncRequire = require('enb-async-require'),
-    clearRequire = require('clear-require');
+    fileEval = require('file-eval');
 
 /**
  * @class ProvideBemdeclTech
@@ -130,6 +129,5 @@ module.exports = inherit(BaseTech, {
 function requireBemdecl(data, filename) {
     if (data) { return vow.resolve(data); }
 
-    clearRequire(filename);
-    return asyncRequire(filename);
+    return fileEval(filename);
 }
diff --git a/techs/provide-deps.js b/techs/provide-deps.js
@@ -3,8 +3,7 @@ var inherit = require('inherit'),
     enb = require('enb'),
     vfs = enb.asyncFS || require('enb/lib/fs/async-fs'),
     BaseTech = enb.BaseTech || require('enb/lib/tech/base-tech'),
-    asyncRequire = require('enb-async-require'),
-    clearRequire = require('clear-require');
+    fileEval = require('file-eval');
 
 /**
  * @class ProvideDepsTech
@@ -129,6 +128,5 @@ module.exports = inherit(BaseTech, {
 function requireDeps(data, filename) {
     if (data) { return vow.resolve(data); }
 
-    clearRequire(filename);
-    return asyncRequire(filename);
+    return fileEval(filename);
 }
diff --git a/techs/subtract-deps.js b/techs/subtract-deps.js
@@ -3,8 +3,7 @@ var inherit = require('inherit'),
     enb = require('enb'),
     vfs = enb.asyncFS || require('enb/lib/fs/async-fs'),
     BaseTech = enb.BaseTech || require('enb/lib/tech/base-tech'),
-    asyncRequire = require('enb-async-require'),
-    clearRequire = require('clear-require'),
+    fileEval = require('file-eval'),
     deps = require('../lib/deps/deps');
 
 /**
@@ -96,9 +95,8 @@ module.exports = inherit(BaseTech, {
                         });
                 } else {
                     node.isValidTarget(target);
-                    clearRequire(targetFilename);
 
-                    return asyncRequire(targetFilename)
+                    return fileEval(targetFilename)
                         .then(function (result) {
                             node.resolveTarget(target, result);
                             return null;
@@ -111,6 +109,5 @@ module.exports = inherit(BaseTech, {
 function requireDeps(deps, filename) {
     if (deps) { return deps; }
 
-    clearRequire(filename);
-    return asyncRequire(filename);
+    return fileEval(filename);
 }
diff --git a/test/techs/bemjson-to-bemdecl.test.js b/test/techs/bemjson-to-bemdecl.test.js
@@ -4,7 +4,7 @@ var path = require('path'),
     mockFs = require('mock-fs'),
     TestNode = require('mock-enb/lib/mock-node'),
 
-    Tech = require('../utils/techs').bemjsonToBemdecl;
+    Tech = require('../..').bemjsonToBemdecl;
 
 describe('techs: bemjson-to-bemdecl', function () {
     afterEach(function () {

diff --git a/test/techs/deps-by-tech-to-bemdecl.test.js b/test/techs/deps-by-tech-to-bemdecl.test.js
@@ -5,7 +5,7 @@ var path = require('path'),
     FileList = require('enb/lib/file-list'),
     TestNode = require('mock-enb/lib/mock-node'),
 
-    techs = require('../utils/techs'),
+    techs = require('../..'),
     levelsTech = techs.levels,
     filesTech = techs.files,
     depsTech = techs.deps,

diff --git a/test/techs/deps.test.js b/test/techs/deps.test.js
@@ -4,7 +4,7 @@ var path = require('path'),
     mockFs = require('mock-fs'),
     TestNode = require('mock-enb/lib/mock-node'),
 
-    techs = require('../utils/techs'),
+    techs = require('../..'),
     levelsTech = techs.levels,
     depsTech = techs.deps;
 

diff --git a/test/techs/files.test.js b/test/techs/files.test.js
@@ -3,7 +3,7 @@ var path = require('path'),
     mockFs = require('mock-fs'),
     TestNode = require('mock-enb/lib/mock-node'),
 
-    techs = require('../utils/techs'),
+    techs = require('../..'),
     levelsTech = techs.levels,
     filesTech = techs.files;
 

diff --git a/test/techs/levels-to-bemdecl.test.js b/test/techs/levels-to-bemdecl.test.js
@@ -3,7 +3,7 @@ var vow = require('vow'),
     mockFs = require('mock-fs'),
     TestNode = require('mock-enb/lib/mock-node'),
 
-    techs = require('../utils/techs'),
+    techs = require('../..'),
     levelsTech = techs.levels,
     levelsToBemdeclTech = techs.levelsToBemdecl;
 

diff --git a/test/techs/levels.test.js b/test/techs/levels.test.js
@@ -3,7 +3,7 @@ var path = require('path'),
     mockFs = require('mock-fs'),
     TestNode = require('mock-enb/lib/mock-node'),
 
-    Tech = require('../utils/techs').levels;
+    Tech = require('../..').levels;
 
 describe('techs: levels', function () {
     afterEach(function () {

diff --git a/test/techs/merge-bemdecl.test.js b/test/techs/merge-bemdecl.test.js
@@ -4,7 +4,7 @@ var path = require('path'),
     mockFs = require('mock-fs'),
     TestNode = require('mock-enb/lib/mock-node'),
 
-    Tech = require('../utils/techs').mergeBemdecl;
+    Tech = require('../..').mergeBemdecl;
 
 describe('techs: merge-bemdecl', function () {
     afterEach(function () {

diff --git a/test/techs/merge-deps.test.js b/test/techs/merge-deps.test.js
@@ -4,7 +4,7 @@ var path = require('path'),
     mockFs = require('mock-fs'),
     TestNode = require('mock-enb/lib/mock-node'),
 
-    Tech = require('../utils/techs').mergeDeps;
+    Tech = require('../..').mergeDeps;
 
 describe('techs: merge-deps', function () {
     afterEach(function () {

diff --git a/test/techs/provide-bemdecl.test.js b/test/techs/provide-bemdecl.test.js
@@ -3,7 +3,7 @@ var path = require('path'),
     mockFs = require('mock-fs'),
     TestNode = require('mock-enb/lib/mock-node'),
 
-    Tech = require('../utils/techs').provideBemdecl;
+    Tech = require('../..').provideBemdecl;
 
 describe('techs: provide-deps', function () {
     var fsBundle,

diff --git a/test/techs/provide-deps.test.js b/test/techs/provide-deps.test.js
@@ -3,7 +3,7 @@ var path = require('path'),
     mockFs = require('mock-fs'),
     TestNode = require('mock-enb/lib/mock-node'),
 
-    Tech = require('../utils/techs').provideDeps;
+    Tech = require('../..').provideDeps;
 
 describe('techs: provide-deps', function () {
     var fsBundle,

diff --git a/test/techs/subtract-deps.test.js b/test/techs/subtract-deps.test.js
@@ -4,7 +4,7 @@ var path = require('path'),
     mockFs = require('mock-fs'),
     TestNode = require('mock-enb/lib/mock-node'),
 
-    Tech = require('../utils/techs').subtractDeps;
+    Tech = require('../..').subtractDeps;
 
 describe('techs: subtract-deps', function () {
     afterEach(function () {

diff --git a/test/utils/async-require.js b/test/utils/async-require.js