Merge pull request #45 from enb-make/issue-44

Support ENB 1.x
enb · Oct 7, 2015 · 6fb2a1a · 6fb2a1a
2 parents 9c99a54 + 8c9bfc7
commit 6fb2a1a
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 9 deletions.
diff --git a/package.json b/package.json
@@ -26,7 +26,7 @@
     "node": ">= 0.8.0"
   },
   "peerDependencies": {
-    "enb": ">= 0.8.22"
+    "enb": ">= 0.15.0 <2.0.0"
   },
   "dependencies": {
     "browserify": "11.1.0",
@@ -40,12 +40,12 @@
     "chai": "3.2.0",
     "chai-as-promised": "5.1.0",
     "chai-string": "1.1.2",
-    "enb": ">= 0.8.22",
+    "enb": ">= 0.15.0 <2.0.0",
     "istanbul": "0.3.20",
     "jscs": "1.13.1",
     "jshint": "2.8.0",
     "mocha": "2.3.2",
-    "mock-enb": "0.2.0",
+    "mock-enb": "0.3.0",
     "mock-fs": "3.2.0",
     "rimraf": "2.4.3"
   },

diff --git a/techs/browser-js.js b/techs/browser-js.js
@@ -1,5 +1,7 @@
 var vow = require('vow'),
-    vfs = require('enb/lib/fs/async-fs'),
+    enb = require('enb'),
+    vfs = enb.asyncFS || require('enb/lib/fs/async-fs'),
+    buildFlow = enb.buildFlow || require('enb/lib/build-flow'),
     utils = require('enb-source-map/lib/utils'),
     File = require('enb-source-map/lib/file'),
     minify = require('uglify-js').minify;
@@ -58,7 +60,7 @@ var vow = require('vow'),
  *     });
  * };
  */
-module.exports = require('enb/lib/build-flow').create()
+module.exports = buildFlow.create()
     .name('browser-js')
     .target('target', '?.browser.js')
     .useFileList(['vanilla.js', 'js', 'browser.js'])

diff --git a/techs/node-js.js b/techs/node-js.js
@@ -1,6 +1,8 @@
 var EOL = require('os').EOL,
     vow = require('vow'),
-    vfs = require('enb/lib/fs/async-fs'),
+    enb = require('enb'),
+    vfs = enb.asyncFS || require('enb/lib/fs/async-fs'),
+    buildFlow = enb.buildFlow || require('enb/lib/build-flow'),
     browserify = require('browserify'),
     promisify = require('vow-node').promisify;
 
@@ -56,7 +58,7 @@ var EOL = require('os').EOL,
  *     });
  * };
  */
-module.exports = require('enb/lib/build-flow').create()
+module.exports = buildFlow.create()
     .name('node-js')
     .target('target', '?.node.js')
     .useFileList(['vanilla.js', 'node.js'])

diff --git a/test/techs/browser-js.test.js b/test/techs/browser-js.test.js
@@ -7,6 +7,7 @@ var EOL = require('os').EOL,
     mock = require('mock-fs'),
     FileList = require('enb/lib/file-list'),
     MockNode = require('mock-enb/lib/mock-node'),
+    loadDirSync = require('mock-enb/utils/dir-utils').loadDirSync,
     browserJsTech = require('../../techs/browser-js');
 
 describe('browser-js', function () {
@@ -135,7 +136,7 @@ function build(blocks, options, isNeedRequire) {
         fileList = new FileList(),
         testFunc;
 
-    fileList.loadFromDirSync('blocks');
+    fileList.addFiles(loadDirSync('blocks'));
 
     bundle.provideTechData('?.files', fileList);
 

diff --git a/test/techs/node-js.test.js b/test/techs/node-js.test.js
@@ -9,6 +9,7 @@ var fs = require('fs'),
     dropRequireCache = require('enb/lib/fs/drop-require-cache'),
     MockNode = require('mock-enb/lib/mock-node'),
     NodeJsTech = require('../../techs/node-js'),
+    loadDirSync = require('mock-enb/utils/dir-utils').loadDirSync,
     rimraf = require('rimraf'),
     EOL = require('os').EOL;
 
@@ -257,7 +258,7 @@ function build(scheme, options) {
     var bundle = new MockNode('bundle'),
         fileList = new FileList();
 
-    fileList.loadFromDirSync('blocks');
+    fileList.addFiles(loadDirSync('blocks'));
 
     bundle.provideTechData('?.files', fileList);